aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs122
-rw-r--r--OpenSim/Client/MXP/ClientStack/MXPClientView.cs2
-rw-r--r--OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs2
-rw-r--r--OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs2
-rw-r--r--OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs13
-rw-r--r--OpenSim/Data/MySQL/MySQLLegacyRegionData.cs199
-rw-r--r--OpenSim/Data/MySQL/Resources/032_RegionStore.sql70
-rw-r--r--OpenSim/Data/Null/NullDataStore.cs11
-rw-r--r--OpenSim/Data/SQLite/SQLiteRegionData.cs13
-rw-r--r--OpenSim/Framework/IClientAPI.cs2
-rw-r--r--OpenSim/Framework/RegionInfo.cs305
-rw-r--r--OpenSim/Framework/Servers/VersionInfo.cs3
-rw-r--r--OpenSim/Framework/TaskInventoryDictionary.cs117
-rw-r--r--OpenSim/Framework/Util.cs26
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs99
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs102
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs11
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs8
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs536
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandObject.cs48
-rw-r--r--OpenSim/Region/CoreModules/World/Meta7Windlight/Meta7WindlightModule.cs274
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs2
-rw-r--r--OpenSim/Region/Framework/Interfaces/IRegionDataStore.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs29
-rw-r--r--OpenSim/Region/Framework/Scenes/EntityManager.cs79
-rw-r--r--OpenSim/Region/Framework/Scenes/EventManager.cs24
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs8
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs44
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs36
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs26
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs534
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs103
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs592
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs571
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneViewer.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs11
-rw-r--r--OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs2
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs2
-rw-r--r--OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs10
-rw-r--r--OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs13
-rw-r--r--OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs10
-rw-r--r--OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs12
-rw-r--r--OpenSim/Region/Physics/ChOdePlugin/AssemblyInfo.cs58
-rw-r--r--OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs1367
-rw-r--r--OpenSim/Region/Physics/ChOdePlugin/ODEDynamics.c_comments630
-rw-r--r--OpenSim/Region/Physics/ChOdePlugin/ODEDynamics.cs792
-rw-r--r--OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs3296
-rw-r--r--OpenSim/Region/Physics/ChOdePlugin/ODERayCastRequestManager.cs375
-rw-r--r--OpenSim/Region/Physics/ChOdePlugin/OdePhysicsJoint.cs (renamed from OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs)46
-rw-r--r--OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs3874
-rw-r--r--OpenSim/Region/Physics/ChOdePlugin/Tests/ODETestClass.cs122
-rw-r--r--OpenSim/Region/Physics/ChOdePlugin/drawstuff.cs98
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsActor.cs12
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODECharacter.cs11
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs12
-rw-r--r--OpenSim/Region/Physics/POSPlugin/POSCharacter.cs10
-rw-r--r--OpenSim/Region/Physics/POSPlugin/POSPrim.cs12
-rw-r--r--OpenSim/Region/Physics/PhysXPlugin/PhysXCharacter.cs8
-rw-r--r--OpenSim/Region/Physics/PhysXPlugin/PhysXPrim.cs2
-rw-r--r--OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs82
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs477
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs963
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs36
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs32
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs21
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Constants.cs77
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs76
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.mdp2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs261
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs422
-rw-r--r--OpenSim/Tests/Common/Mock/TestClient.cs2
-rw-r--r--bin/OpenSim.ini.example15
-rw-r--r--prebuild.xml30
78 files changed, 15610 insertions, 1698 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index c59ea28..0c1e3ca 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -125,6 +125,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
125 availableMethods["admin_region_query"] = XmlRpcRegionQueryMethod; 125 availableMethods["admin_region_query"] = XmlRpcRegionQueryMethod;
126 availableMethods["admin_shutdown"] = XmlRpcShutdownMethod; 126 availableMethods["admin_shutdown"] = XmlRpcShutdownMethod;
127 availableMethods["admin_broadcast"] = XmlRpcAlertMethod; 127 availableMethods["admin_broadcast"] = XmlRpcAlertMethod;
128 availableMethods["admin_dialog"] = XmlRpcDialogMethod;
128 availableMethods["admin_restart"] = XmlRpcRestartMethod; 129 availableMethods["admin_restart"] = XmlRpcRestartMethod;
129 availableMethods["admin_load_heightmap"] = XmlRpcLoadHeightmapMethod; 130 availableMethods["admin_load_heightmap"] = XmlRpcLoadHeightmapMethod;
130 // User management 131 // User management
@@ -214,9 +215,59 @@ namespace OpenSim.ApplicationPlugins.RemoteController
214 if (!m_app.SceneManager.TryGetScene(regionID, out rebootedScene)) 215 if (!m_app.SceneManager.TryGetScene(regionID, out rebootedScene))
215 throw new Exception("region not found"); 216 throw new Exception("region not found");
216 217
218 int timeout = 30000;
219 string message;
220
221 if (requestData.ContainsKey("restart")
222 && ((string)requestData["restart"] == "delayed")
223 && requestData.ContainsKey("milliseconds"))
224 {
225 timeout = Int32.Parse(requestData["milliseconds"].ToString());
226
227 if (timeout < 15000)
228 {
229 //It must be at least 15 seconds or we'll cancel the reboot request
230 timeout = 15000;
231 }
232
233 message
234 = "Region is restarting in " + ((int)(timeout / 1000)).ToString()
235 + " second(s). Please save what you are doing and log out.";
236 }
237 else
238 {
239 message = "Region is restarting in 30 second(s). Please save what you are doing and log out.";
240 }
241
242 if (requestData.ContainsKey("noticetype")
243 && ((string)requestData["noticetype"] == "dialog"))
244 {
245 m_app.SceneManager.ForEachScene(
246 delegate(Scene scene)
247 {
248 IDialogModule dialogModule = scene.RequestModuleInterface<IDialogModule>();
249 if (dialogModule != null)
250 dialogModule.SendNotificationToUsersInRegion(UUID.Zero, "System", message);
251 });
252 }
253 else
254 {
255 if (!requestData.ContainsKey("noticetype")
256 || ((string)requestData["noticetype"] != "none"))
257 {
258 m_app.SceneManager.ForEachScene(
259 delegate(Scene scene)
260 {
261 IDialogModule dialogModule = scene.RequestModuleInterface<IDialogModule>();
262 if (dialogModule != null)
263 dialogModule.SendGeneralAlert(message);
264 });
265 }
266 }
267
217 responseData["rebooting"] = true; 268 responseData["rebooting"] = true;
218 response.Value = responseData; 269 response.Value = responseData;
219 rebootedScene.Restart(30); 270 rebootedScene.Restart(timeout / 1000,false);
220 } 271 }
221 catch (Exception e) 272 catch (Exception e)
222 { 273 {
@@ -279,6 +330,53 @@ namespace OpenSim.ApplicationPlugins.RemoteController
279 m_log.Info("[RADMIN]: Alert request complete"); 330 m_log.Info("[RADMIN]: Alert request complete");
280 return response; 331 return response;
281 } 332 }
333 public XmlRpcResponse XmlRpcDialogMethod(XmlRpcRequest request, IPEndPoint remoteClient)
334 {
335 XmlRpcResponse response = new XmlRpcResponse();
336 Hashtable responseData = new Hashtable();
337
338 m_log.Info("[RADMIN]: Dialog request started");
339
340 try
341 {
342 Hashtable requestData = (Hashtable)request.Params[0];
343
344 checkStringParameters(request, new string[] { "password", "from", "message" });
345
346 if (m_requiredPassword != String.Empty &&
347 (!requestData.Contains("password") || (string)requestData["password"] != m_requiredPassword))
348 throw new Exception("wrong password");
349
350 string message = (string)requestData["message"];
351 string fromuuid = (string)requestData["from"];
352 m_log.InfoFormat("[RADMIN]: Broadcasting: {0}", message);
353
354 responseData["accepted"] = true;
355 responseData["success"] = true;
356 response.Value = responseData;
357
358 m_app.SceneManager.ForEachScene(
359 delegate(Scene scene)
360 {
361 IDialogModule dialogModule = scene.RequestModuleInterface<IDialogModule>();
362 if (dialogModule != null)
363 dialogModule.SendNotificationToUsersInRegion(UUID.Zero, fromuuid, message);
364 });
365 }
366 catch (Exception e)
367 {
368 m_log.ErrorFormat("[RADMIN]: Broadcasting: failed: {0}", e.Message);
369 m_log.DebugFormat("[RADMIN]: Broadcasting: failed: {0}", e.ToString());
370
371 responseData["accepted"] = false;
372 responseData["success"] = false;
373 responseData["error"] = e.Message;
374 response.Value = responseData;
375 }
376
377 m_log.Info("[RADMIN]: Alert request complete");
378 return response;
379 }
282 380
283 public XmlRpcResponse XmlRpcLoadHeightmapMethod(XmlRpcRequest request, IPEndPoint remoteClient) 381 public XmlRpcResponse XmlRpcLoadHeightmapMethod(XmlRpcRequest request, IPEndPoint remoteClient)
284 { 382 {
@@ -386,13 +484,33 @@ namespace OpenSim.ApplicationPlugins.RemoteController
386 message = "Region is going down now."; 484 message = "Region is going down now.";
387 } 485 }
388 486
389 m_app.SceneManager.ForEachScene( 487 if (requestData.ContainsKey("noticetype")
488 && ((string) requestData["noticetype"] == "dialog"))
489 {
490 m_app.SceneManager.ForEachScene(
390 delegate(Scene scene) 491 delegate(Scene scene)
391 { 492 {
392 IDialogModule dialogModule = scene.RequestModuleInterface<IDialogModule>(); 493 IDialogModule dialogModule = scene.RequestModuleInterface<IDialogModule>();
393 if (dialogModule != null) 494 if (dialogModule != null)
495 dialogModule.SendNotificationToUsersInRegion(UUID.Zero, "System", message);
496 });
497 }
498 else
499 {
500 if (!requestData.ContainsKey("noticetype")
501 || ((string)requestData["noticetype"] != "none"))
502 {
503 m_app.SceneManager.ForEachScene(
504 delegate(Scene scene)
505 {
506 IDialogModule dialogModule = scene.RequestModuleInterface<IDialogModule>();
507 if (dialogModule != null)
394 dialogModule.SendGeneralAlert(message); 508 dialogModule.SendGeneralAlert(message);
395 }); 509 });
510 }
511 }
512
513
396 514
397 // Perform shutdown 515 // Perform shutdown
398 System.Timers.Timer shutdownTimer = new System.Timers.Timer(timeout); // Wait before firing 516 System.Timers.Timer shutdownTimer = new System.Timers.Timer(timeout); // Wait before firing
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
index cf87a30..7b9faa9 100644
--- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
+++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
@@ -929,7 +929,7 @@ namespace OpenSim.Client.MXP.ClientStack
929 // Need to translate to MXP somehow 929 // Need to translate to MXP somehow
930 } 930 }
931 931
932 public void SendGenericMessage(string method, List<string> message) 932 public void SendGenericMessage(string method, List<byte[]> message)
933 { 933 {
934 // Need to translate to MXP somehow 934 // Need to translate to MXP somehow
935 } 935 }
diff --git a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
index 56f5f8f..b7ead6e 100644
--- a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
+++ b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
@@ -502,7 +502,7 @@ namespace OpenSim.Client.Sirikata.ClientStack
502 throw new System.NotImplementedException(); 502 throw new System.NotImplementedException();
503 } 503 }
504 504
505 public void SendGenericMessage(string method, List<string> message) 505 public void SendGenericMessage(string method, List<Byte[]> message)
506 { 506 {
507 throw new System.NotImplementedException(); 507 throw new System.NotImplementedException();
508 } 508 }
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
index b8f46dc..d51277b 100644
--- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
+++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
@@ -508,7 +508,7 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
508 throw new System.NotImplementedException(); 508 throw new System.NotImplementedException();
509 } 509 }
510 510
511 public void SendGenericMessage(string method, List<string> message) 511 public void SendGenericMessage(string method, List<byte[]> message)
512 { 512 {
513 throw new System.NotImplementedException(); 513 throw new System.NotImplementedException();
514 } 514 }
diff --git a/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs b/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs
index c849f38..b1339b6 100644
--- a/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLLegacyRegionData.cs
@@ -691,7 +691,16 @@ VALUES
691 cmd.ExecuteNonQuery(); 691 cmd.ExecuteNonQuery();
692 } 692 }
693 } 693 }
694 694 public RegionMeta7WindlightData LoadRegionWindlightSettings(UUID regionUUID)
695 {
696 //This connector doesn't support the windlight module yet
697 //Return default LL windlight settings
698 return new RegionMeta7WindlightData();
699 }
700 public void StoreRegionWindlightSettings(RegionMeta7WindlightData wl)
701 {
702 //This connector doesn't support the windlight module yet
703 }
695 /// <summary> 704 /// <summary>
696 /// Loads the settings of a region. 705 /// Loads the settings of a region.
697 /// </summary> 706 /// </summary>
@@ -718,7 +727,7 @@ VALUES
718 } 727 }
719 } 728 }
720 729
721 //If comes here then there is now region setting for that region 730 //If we reach this point then there are new region settings for that region
722 regionSettings = new RegionSettings(); 731 regionSettings = new RegionSettings();
723 regionSettings.RegionUUID = regionUUID; 732 regionSettings.RegionUUID = regionUUID;
724 regionSettings.OnSave += StoreRegionSettings; 733 regionSettings.OnSave += StoreRegionSettings;
diff --git a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
index a06eec3..f84beb6 100644
--- a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
@@ -711,6 +711,102 @@ namespace OpenSim.Data.MySQL
711 } 711 }
712 } 712 }
713 713
714 public RegionMeta7WindlightData LoadRegionWindlightSettings(UUID regionUUID)
715 {
716 RegionMeta7WindlightData nWP = new RegionMeta7WindlightData();
717 nWP.OnSave += StoreRegionWindlightSettings;
718
719 using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
720 {
721 dbcon.Open();
722
723 string command = "select * from `regionwindlight` where region_id = ?regionID";
724
725 using(MySqlCommand cmd = new MySqlCommand(command))
726 {
727 cmd.Connection = dbcon;
728
729 cmd.Parameters.AddWithValue("?regionID", regionUUID.ToString());
730
731 IDataReader result = ExecuteReader(cmd);
732 if (!result.Read())
733 {
734 //No result, so store our default windlight profile and return it
735 nWP.regionID = regionUUID;
736 StoreRegionWindlightSettings(nWP);
737 return nWP;
738 }
739 else
740 {
741 UUID.TryParse(result["region_id"].ToString(), out nWP.regionID);
742 nWP.waterColor.X = Convert.ToSingle(result["water_color_r"]);
743 nWP.waterColor.Y = Convert.ToSingle(result["water_color_g"]);
744 nWP.waterColor.Z = Convert.ToSingle(result["water_color_b"]);
745 nWP.waterFogDensityExponent = Convert.ToSingle(result["water_fog_density_exponent"]);
746 nWP.underwaterFogModifier = Convert.ToSingle(result["underwater_fog_modifier"]);
747 nWP.reflectionWaveletScale.X = Convert.ToSingle(result["reflection_wavelet_scale_1"]);
748 nWP.reflectionWaveletScale.Y = Convert.ToSingle(result["reflection_wavelet_scale_2"]);
749 nWP.reflectionWaveletScale.Z = Convert.ToSingle(result["reflection_wavelet_scale_3"]);
750 nWP.fresnelScale = Convert.ToSingle(result["fresnel_scale"]);
751 nWP.fresnelOffset = Convert.ToSingle(result["fresnel_offset"]);
752 nWP.refractScaleAbove = Convert.ToSingle(result["refract_scale_above"]);
753 nWP.refractScaleBelow = Convert.ToSingle(result["refract_scale_below"]);
754 nWP.blurMultiplier = Convert.ToSingle(result["blur_multiplier"]);
755 nWP.bigWaveDirection.X = Convert.ToSingle(result["big_wave_direction_x"]);
756 nWP.bigWaveDirection.Y = Convert.ToSingle(result["big_wave_direction_y"]);
757 nWP.littleWaveDirection.X = Convert.ToSingle(result["little_wave_direction_x"]);
758 nWP.littleWaveDirection.Y = Convert.ToSingle(result["little_wave_direction_y"]);
759 UUID.TryParse(result["normal_map_texture"].ToString(), out nWP.normalMapTexture);
760 nWP.horizon.X = Convert.ToSingle(result["horizon_r"]);
761 nWP.horizon.Y = Convert.ToSingle(result["horizon_g"]);
762 nWP.horizon.Z = Convert.ToSingle(result["horizon_b"]);
763 nWP.horizon.W = Convert.ToSingle(result["horizon_i"]);
764 nWP.hazeHorizon = Convert.ToSingle(result["haze_horizon"]);
765 nWP.blueDensity.X = Convert.ToSingle(result["blue_density_r"]);
766 nWP.blueDensity.Y = Convert.ToSingle(result["blue_density_g"]);
767 nWP.blueDensity.Z = Convert.ToSingle(result["blue_density_b"]);
768 nWP.blueDensity.W = Convert.ToSingle(result["blue_density_i"]);
769 nWP.hazeDensity = Convert.ToSingle(result["haze_density"]);
770 nWP.densityMultiplier = Convert.ToSingle(result["density_multiplier"]);
771 nWP.distanceMultiplier = Convert.ToSingle(result["distance_multiplier"]);
772 nWP.maxAltitude = Convert.ToUInt16(result["max_altitude"]);
773 nWP.sunMoonColor.X = Convert.ToSingle(result["sun_moon_color_r"]);
774 nWP.sunMoonColor.Y = Convert.ToSingle(result["sun_moon_color_g"]);
775 nWP.sunMoonColor.Z = Convert.ToSingle(result["sun_moon_color_b"]);
776 nWP.sunMoonColor.W = Convert.ToSingle(result["sun_moon_color_i"]);
777 nWP.sunMoonPosition = Convert.ToSingle(result["sun_moon_position"]);
778 nWP.ambient.X = Convert.ToSingle(result["ambient_r"]);
779 nWP.ambient.Y = Convert.ToSingle(result["ambient_g"]);
780 nWP.ambient.Z = Convert.ToSingle(result["ambient_b"]);
781 nWP.ambient.W = Convert.ToSingle(result["ambient_i"]);
782 nWP.eastAngle = Convert.ToSingle(result["east_angle"]);
783 nWP.sunGlowFocus = Convert.ToSingle(result["sun_glow_focus"]);
784 nWP.sunGlowSize = Convert.ToSingle(result["sun_glow_size"]);
785 nWP.sceneGamma = Convert.ToSingle(result["scene_gamma"]);
786 nWP.starBrightness = Convert.ToSingle(result["star_brightness"]);
787 nWP.cloudColor.X = Convert.ToSingle(result["cloud_color_r"]);
788 nWP.cloudColor.Y = Convert.ToSingle(result["cloud_color_g"]);
789 nWP.cloudColor.Z = Convert.ToSingle(result["cloud_color_b"]);
790 nWP.cloudColor.W = Convert.ToSingle(result["cloud_color_i"]);
791 nWP.cloudXYDensity.X = Convert.ToSingle(result["cloud_x"]);
792 nWP.cloudXYDensity.Y = Convert.ToSingle(result["cloud_y"]);
793 nWP.cloudXYDensity.Z = Convert.ToSingle(result["cloud_density"]);
794 nWP.cloudCoverage = Convert.ToSingle(result["cloud_coverage"]);
795 nWP.cloudScale = Convert.ToSingle(result["cloud_scale"]);
796 nWP.cloudDetailXYDensity.X = Convert.ToSingle(result["cloud_detail_x"]);
797 nWP.cloudDetailXYDensity.Y = Convert.ToSingle(result["cloud_detail_y"]);
798 nWP.cloudDetailXYDensity.Z = Convert.ToSingle(result["cloud_detail_density"]);
799 nWP.cloudScrollX = Convert.ToSingle(result["cloud_scroll_x"]);
800 nWP.cloudScrollXLock = Convert.ToBoolean(result["cloud_scroll_x_lock"]);
801 nWP.cloudScrollY = Convert.ToSingle(result["cloud_scroll_y"]);
802 nWP.cloudScrollYLock = Convert.ToBoolean(result["cloud_scroll_y_lock"]);
803 nWP.drawClassicClouds = Convert.ToBoolean(result["draw_classic_clouds"]);
804 }
805 }
806 }
807 return nWP;
808 }
809
714 public RegionSettings LoadRegionSettings(UUID regionUUID) 810 public RegionSettings LoadRegionSettings(UUID regionUUID)
715 { 811 {
716 RegionSettings rs = null; 812 RegionSettings rs = null;
@@ -749,6 +845,109 @@ namespace OpenSim.Data.MySQL
749 return rs; 845 return rs;
750 } 846 }
751 847
848 public void StoreRegionWindlightSettings(RegionMeta7WindlightData wl)
849 {
850 using (MySqlConnection dbcon = new MySqlConnection(m_connectionString))
851 {
852 dbcon.Open();
853
854 using (MySqlCommand cmd = dbcon.CreateCommand())
855 {
856 cmd.CommandText = "REPLACE INTO `regionwindlight` (`region_id`, `water_color_r`, `water_color_g`, ";
857 cmd.CommandText += "`water_color_b`, `water_fog_density_exponent`, `underwater_fog_modifier`, ";
858 cmd.CommandText += "`reflection_wavelet_scale_1`, `reflection_wavelet_scale_2`, `reflection_wavelet_scale_3`, ";
859 cmd.CommandText += "`fresnel_scale`, `fresnel_offset`, `refract_scale_above`, `refract_scale_below`, ";
860 cmd.CommandText += "`blur_multiplier`, `big_wave_direction_x`, `big_wave_direction_y`, `little_wave_direction_x`, ";
861 cmd.CommandText += "`little_wave_direction_y`, `normal_map_texture`, `horizon_r`, `horizon_g`, `horizon_b`, ";
862 cmd.CommandText += "`horizon_i`, `haze_horizon`, `blue_density_r`, `blue_density_g`, `blue_density_b`, ";
863 cmd.CommandText += "`blue_density_i`, `haze_density`, `density_multiplier`, `distance_multiplier`, `max_altitude`, ";
864 cmd.CommandText += "`sun_moon_color_r`, `sun_moon_color_g`, `sun_moon_color_b`, `sun_moon_color_i`, `sun_moon_position`, ";
865 cmd.CommandText += "`ambient_r`, `ambient_g`, `ambient_b`, `ambient_i`, `east_angle`, `sun_glow_focus`, `sun_glow_size`, ";
866 cmd.CommandText += "`scene_gamma`, `star_brightness`, `cloud_color_r`, `cloud_color_g`, `cloud_color_b`, `cloud_color_i`, ";
867 cmd.CommandText += "`cloud_x`, `cloud_y`, `cloud_density`, `cloud_coverage`, `cloud_scale`, `cloud_detail_x`, ";
868 cmd.CommandText += "`cloud_detail_y`, `cloud_detail_density`, `cloud_scroll_x`, `cloud_scroll_x_lock`, `cloud_scroll_y`, ";
869 cmd.CommandText += "`cloud_scroll_y_lock`, `draw_classic_clouds`) VALUES (?region_id, ?water_color_r, ";
870 cmd.CommandText += "?water_color_g, ?water_color_b, ?water_fog_density_exponent, ?underwater_fog_modifier, ?reflection_wavelet_scale_1, ";
871 cmd.CommandText += "?reflection_wavelet_scale_2, ?reflection_wavelet_scale_3, ?fresnel_scale, ?fresnel_offset, ?refract_scale_above, ";
872 cmd.CommandText += "?refract_scale_below, ?blur_multiplier, ?big_wave_direction_x, ?big_wave_direction_y, ?little_wave_direction_x, ";
873 cmd.CommandText += "?little_wave_direction_y, ?normal_map_texture, ?horizon_r, ?horizon_g, ?horizon_b, ?horizon_i, ?haze_horizon, ";
874 cmd.CommandText += "?blue_density_r, ?blue_density_g, ?blue_density_b, ?blue_density_i, ?haze_density, ?density_multiplier, ";
875 cmd.CommandText += "?distance_multiplier, ?max_altitude, ?sun_moon_color_r, ?sun_moon_color_g, ?sun_moon_color_b, ";
876 cmd.CommandText += "?sun_moon_color_i, ?sun_moon_position, ?ambient_r, ?ambient_g, ?ambient_b, ?ambient_i, ?east_angle, ";
877 cmd.CommandText += "?sun_glow_focus, ?sun_glow_size, ?scene_gamma, ?star_brightness, ?cloud_color_r, ?cloud_color_g, ";
878 cmd.CommandText += "?cloud_color_b, ?cloud_color_i, ?cloud_x, ?cloud_y, ?cloud_density, ?cloud_coverage, ?cloud_scale, ";
879 cmd.CommandText += "?cloud_detail_x, ?cloud_detail_y, ?cloud_detail_density, ?cloud_scroll_x, ?cloud_scroll_x_lock, ";
880 cmd.CommandText += "?cloud_scroll_y, ?cloud_scroll_y_lock, ?draw_classic_clouds)";
881
882 cmd.Parameters.AddWithValue("region_id", wl.regionID);
883 cmd.Parameters.AddWithValue("water_color_r", wl.waterColor.X);
884 cmd.Parameters.AddWithValue("water_color_g", wl.waterColor.Y);
885 cmd.Parameters.AddWithValue("water_color_b", wl.waterColor.Z);
886 cmd.Parameters.AddWithValue("water_fog_density_exponent", wl.waterFogDensityExponent);
887 cmd.Parameters.AddWithValue("underwater_fog_modifier", wl.underwaterFogModifier);
888 cmd.Parameters.AddWithValue("reflection_wavelet_scale_1", wl.reflectionWaveletScale.X);
889 cmd.Parameters.AddWithValue("reflection_wavelet_scale_2", wl.reflectionWaveletScale.Y);
890 cmd.Parameters.AddWithValue("reflection_wavelet_scale_3", wl.reflectionWaveletScale.Z);
891 cmd.Parameters.AddWithValue("fresnel_scale", wl.fresnelScale);
892 cmd.Parameters.AddWithValue("fresnel_offset", wl.fresnelOffset);
893 cmd.Parameters.AddWithValue("refract_scale_above", wl.refractScaleAbove);
894 cmd.Parameters.AddWithValue("refract_scale_below", wl.refractScaleBelow);
895 cmd.Parameters.AddWithValue("blur_multiplier", wl.blurMultiplier);
896 cmd.Parameters.AddWithValue("big_wave_direction_x", wl.bigWaveDirection.X);
897 cmd.Parameters.AddWithValue("big_wave_direction_y", wl.bigWaveDirection.Y);
898 cmd.Parameters.AddWithValue("little_wave_direction_x", wl.littleWaveDirection.X);
899 cmd.Parameters.AddWithValue("little_wave_direction_y", wl.littleWaveDirection.Y);
900 cmd.Parameters.AddWithValue("normal_map_texture", wl.normalMapTexture);
901 cmd.Parameters.AddWithValue("horizon_r", wl.horizon.X);
902 cmd.Parameters.AddWithValue("horizon_g", wl.horizon.Y);
903 cmd.Parameters.AddWithValue("horizon_b", wl.horizon.Z);
904 cmd.Parameters.AddWithValue("horizon_i", wl.horizon.W);
905 cmd.Parameters.AddWithValue("haze_horizon", wl.hazeHorizon);
906 cmd.Parameters.AddWithValue("blue_density_r", wl.blueDensity.X);
907 cmd.Parameters.AddWithValue("blue_density_g", wl.blueDensity.Y);
908 cmd.Parameters.AddWithValue("blue_density_b", wl.blueDensity.Z);
909 cmd.Parameters.AddWithValue("blue_density_i", wl.blueDensity.W);
910 cmd.Parameters.AddWithValue("haze_density", wl.hazeDensity);
911 cmd.Parameters.AddWithValue("density_multiplier", wl.densityMultiplier);
912 cmd.Parameters.AddWithValue("distance_multiplier", wl.distanceMultiplier);
913 cmd.Parameters.AddWithValue("max_altitude", wl.maxAltitude);
914 cmd.Parameters.AddWithValue("sun_moon_color_r", wl.sunMoonColor.X);
915 cmd.Parameters.AddWithValue("sun_moon_color_g", wl.sunMoonColor.Y);
916 cmd.Parameters.AddWithValue("sun_moon_color_b", wl.sunMoonColor.Z);
917 cmd.Parameters.AddWithValue("sun_moon_color_i", wl.sunMoonColor.W);
918 cmd.Parameters.AddWithValue("sun_moon_position", wl.sunMoonPosition);
919 cmd.Parameters.AddWithValue("ambient_r", wl.ambient.X);
920 cmd.Parameters.AddWithValue("ambient_g", wl.ambient.Y);
921 cmd.Parameters.AddWithValue("ambient_b", wl.ambient.Z);
922 cmd.Parameters.AddWithValue("ambient_i", wl.ambient.W);
923 cmd.Parameters.AddWithValue("east_angle", wl.eastAngle);
924 cmd.Parameters.AddWithValue("sun_glow_focus", wl.sunGlowFocus);
925 cmd.Parameters.AddWithValue("sun_glow_size", wl.sunGlowSize);
926 cmd.Parameters.AddWithValue("scene_gamma", wl.sceneGamma);
927 cmd.Parameters.AddWithValue("star_brightness", wl.starBrightness);
928 cmd.Parameters.AddWithValue("cloud_color_r", wl.cloudColor.X);
929 cmd.Parameters.AddWithValue("cloud_color_g", wl.cloudColor.Y);
930 cmd.Parameters.AddWithValue("cloud_color_b", wl.cloudColor.Z);
931 cmd.Parameters.AddWithValue("cloud_color_i", wl.cloudColor.W);
932 cmd.Parameters.AddWithValue("cloud_x", wl.cloudXYDensity.X);
933 cmd.Parameters.AddWithValue("cloud_y", wl.cloudXYDensity.Y);
934 cmd.Parameters.AddWithValue("cloud_density", wl.cloudXYDensity.Z);
935 cmd.Parameters.AddWithValue("cloud_coverage", wl.cloudCoverage);
936 cmd.Parameters.AddWithValue("cloud_scale", wl.cloudScale);
937 cmd.Parameters.AddWithValue("cloud_detail_x", wl.cloudDetailXYDensity.X);
938 cmd.Parameters.AddWithValue("cloud_detail_y", wl.cloudDetailXYDensity.Y);
939 cmd.Parameters.AddWithValue("cloud_detail_density", wl.cloudDetailXYDensity.Z);
940 cmd.Parameters.AddWithValue("cloud_scroll_x", wl.cloudScrollX);
941 cmd.Parameters.AddWithValue("cloud_scroll_x_lock", wl.cloudScrollXLock);
942 cmd.Parameters.AddWithValue("cloud_scroll_y", wl.cloudScrollY);
943 cmd.Parameters.AddWithValue("cloud_scroll_y_lock", wl.cloudScrollYLock);
944 cmd.Parameters.AddWithValue("draw_classic_clouds", wl.drawClassicClouds);
945
946 ExecuteNonQuery(cmd);
947 }
948 }
949 }
950
752 public void StoreRegionSettings(RegionSettings rs) 951 public void StoreRegionSettings(RegionSettings rs)
753 { 952 {
754 lock (m_dbLock) 953 lock (m_dbLock)
diff --git a/OpenSim/Data/MySQL/Resources/032_RegionStore.sql b/OpenSim/Data/MySQL/Resources/032_RegionStore.sql
new file mode 100644
index 0000000..b10ffcf
--- /dev/null
+++ b/OpenSim/Data/MySQL/Resources/032_RegionStore.sql
@@ -0,0 +1,70 @@
1BEGIN;
2
3CREATE TABLE `regionwindlight` (
4 `region_id` varchar(36) NOT NULL DEFAULT '000000-0000-0000-0000-000000000000',
5 `water_color_r` float(9,6) unsigned NOT NULL DEFAULT '4.000000',
6 `water_color_g` float(9,6) unsigned NOT NULL DEFAULT '38.000000',
7 `water_color_b` float(9,6) unsigned NOT NULL DEFAULT '64.000000',
8 `water_fog_density_exponent` float(3,1) unsigned NOT NULL DEFAULT '4.0',
9 `underwater_fog_modifier` float(3,2) unsigned NOT NULL DEFAULT '0.25',
10 `reflection_wavelet_scale_1` float(3,1) unsigned NOT NULL DEFAULT '2.0',
11 `reflection_wavelet_scale_2` float(3,1) unsigned NOT NULL DEFAULT '2.0',
12 `reflection_wavelet_scale_3` float(3,1) unsigned NOT NULL DEFAULT '2.0',
13 `fresnel_scale` float(3,2) unsigned NOT NULL DEFAULT '0.40',
14 `fresnel_offset` float(3,2) unsigned NOT NULL DEFAULT '0.50',
15 `refract_scale_above` float(3,2) unsigned NOT NULL DEFAULT '0.03',
16 `refract_scale_below` float(3,2) unsigned NOT NULL DEFAULT '0.20',
17 `blur_multiplier` float(4,3) unsigned NOT NULL DEFAULT '0.040',
18 `big_wave_direction_x` float(3,2) NOT NULL DEFAULT '1.05',
19 `big_wave_direction_y` float(3,2) NOT NULL DEFAULT '-0.42',
20 `little_wave_direction_x` float(3,2) NOT NULL DEFAULT '1.11',
21 `little_wave_direction_y` float(3,2) NOT NULL DEFAULT '-1.16',
22 `normal_map_texture` varchar(36) NOT NULL DEFAULT '822ded49-9a6c-f61c-cb89-6df54f42cdf4',
23 `horizon_r` float(3,2) unsigned NOT NULL DEFAULT '0.25',
24 `horizon_g` float(3,2) unsigned NOT NULL DEFAULT '0.25',
25 `horizon_b` float(3,2) unsigned NOT NULL DEFAULT '0.32',
26 `horizon_i` float(3,2) unsigned NOT NULL DEFAULT '0.32',
27 `haze_horizon` float(3,2) unsigned NOT NULL DEFAULT '0.19',
28 `blue_density_r` float(3,2) unsigned NOT NULL DEFAULT '0.12',
29 `blue_density_g` float(3,2) unsigned NOT NULL DEFAULT '0.22',
30 `blue_density_b` float(3,2) unsigned NOT NULL DEFAULT '0.38',
31 `blue_density_i` float(3,2) unsigned NOT NULL DEFAULT '0.38',
32 `haze_density` float(3,2) unsigned NOT NULL DEFAULT '0.70',
33 `density_multiplier` float(3,2) unsigned NOT NULL DEFAULT '0.18',
34 `distance_multiplier` float(4,1) unsigned NOT NULL DEFAULT '0.8',
35 `max_altitude` int(4) unsigned NOT NULL DEFAULT '1605',
36 `sun_moon_color_r` float(3,2) unsigned NOT NULL DEFAULT '0.24',
37 `sun_moon_color_g` float(3,2) unsigned NOT NULL DEFAULT '0.26',
38 `sun_moon_color_b` float(3,2) unsigned NOT NULL DEFAULT '0.30',
39 `sun_moon_color_i` float(3,2) unsigned NOT NULL DEFAULT '0.30',
40 `sun_moon_position` float(4,3) unsigned NOT NULL DEFAULT '0.317',
41 `ambient_r` float(3,2) unsigned NOT NULL DEFAULT '0.35',
42 `ambient_g` float(3,2) unsigned NOT NULL DEFAULT '0.35',
43 `ambient_b` float(3,2) unsigned NOT NULL DEFAULT '0.35',
44 `ambient_i` float(3,2) unsigned NOT NULL DEFAULT '0.35',
45 `east_angle` float(3,2) unsigned NOT NULL DEFAULT '0.00',
46 `sun_glow_focus` float(3,2) unsigned NOT NULL DEFAULT '0.10',
47 `sun_glow_size` float(3,2) unsigned NOT NULL DEFAULT '1.75',
48 `scene_gamma` float(4,2) unsigned NOT NULL DEFAULT '1.00',
49 `star_brightness` float(3,2) unsigned NOT NULL DEFAULT '0.00',
50 `cloud_color_r` float(3,2) unsigned NOT NULL DEFAULT '0.41',
51 `cloud_color_g` float(3,2) unsigned NOT NULL DEFAULT '0.41',
52 `cloud_color_b` float(3,2) unsigned NOT NULL DEFAULT '0.41',
53 `cloud_color_i` float(3,2) unsigned NOT NULL DEFAULT '0.41',
54 `cloud_x` float(3,2) unsigned NOT NULL DEFAULT '1.00',
55 `cloud_y` float(3,2) unsigned NOT NULL DEFAULT '0.53',
56 `cloud_density` float(3,2) unsigned NOT NULL DEFAULT '1.00',
57 `cloud_coverage` float(3,2) unsigned NOT NULL DEFAULT '0.27',
58 `cloud_scale` float(3,2) unsigned NOT NULL DEFAULT '0.42',
59 `cloud_detail_x` float(3,2) unsigned NOT NULL DEFAULT '1.00',
60 `cloud_detail_y` float(3,2) unsigned NOT NULL DEFAULT '0.53',
61 `cloud_detail_density` float(3,2) unsigned NOT NULL DEFAULT '0.12',
62 `cloud_scroll_x` float(3,2) unsigned NOT NULL DEFAULT '0.20',
63 `cloud_scroll_x_lock` tinyint(1) unsigned NOT NULL DEFAULT '0',
64 `cloud_scroll_y` float(3,2) unsigned NOT NULL DEFAULT '0.01',
65 `cloud_scroll_y_lock` tinyint(1) unsigned NOT NULL DEFAULT '0',
66 `draw_classic_clouds` tinyint(1) unsigned NOT NULL DEFAULT '1',
67 PRIMARY KEY (`region_id`)
68);
69
70COMMIT; \ No newline at end of file
diff --git a/OpenSim/Data/Null/NullDataStore.cs b/OpenSim/Data/Null/NullDataStore.cs
index 427fa0a..4b6d0f3 100644
--- a/OpenSim/Data/Null/NullDataStore.cs
+++ b/OpenSim/Data/Null/NullDataStore.cs
@@ -50,7 +50,16 @@ namespace OpenSim.Data.Null
50 public void StoreRegionSettings(RegionSettings rs) 50 public void StoreRegionSettings(RegionSettings rs)
51 { 51 {
52 } 52 }
53 53 public RegionMeta7WindlightData LoadRegionWindlightSettings(UUID regionUUID)
54 {
55 //This connector doesn't support the windlight module yet
56 //Return default LL windlight settings
57 return new RegionMeta7WindlightData();
58 }
59 public void StoreRegionWindlightSettings(RegionMeta7WindlightData wl)
60 {
61 //This connector doesn't support the windlight module yet
62 }
54 public RegionSettings LoadRegionSettings(UUID regionUUID) 63 public RegionSettings LoadRegionSettings(UUID regionUUID)
55 { 64 {
56 return null; 65 return null;
diff --git a/OpenSim/Data/SQLite/SQLiteRegionData.cs b/OpenSim/Data/SQLite/SQLiteRegionData.cs
index 5a4ee2a..81c0703 100644
--- a/OpenSim/Data/SQLite/SQLiteRegionData.cs
+++ b/OpenSim/Data/SQLite/SQLiteRegionData.cs
@@ -272,7 +272,16 @@ namespace OpenSim.Data.SQLite
272 Commit(); 272 Commit();
273 } 273 }
274 } 274 }
275 275 public RegionMeta7WindlightData LoadRegionWindlightSettings(UUID regionUUID)
276 {
277 //This connector doesn't support the windlight module yet
278 //Return default LL windlight settings
279 return new RegionMeta7WindlightData();
280 }
281 public void StoreRegionWindlightSettings(RegionMeta7WindlightData wl)
282 {
283 //This connector doesn't support the windlight module yet
284 }
276 public RegionSettings LoadRegionSettings(UUID regionUUID) 285 public RegionSettings LoadRegionSettings(UUID regionUUID)
277 { 286 {
278 lock (ds) 287 lock (ds)
@@ -320,7 +329,7 @@ namespace OpenSim.Data.SQLite
320 { 329 {
321 foreach (SceneObjectPart prim in obj.Children.Values) 330 foreach (SceneObjectPart prim in obj.Children.Values)
322 { 331 {
323 m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID); 332// m_log.Info("[REGION DB]: Adding obj: " + obj.UUID + " to region: " + regionUUID);
324 addPrim(prim, obj.UUID, regionUUID); 333 addPrim(prim, obj.UUID, regionUUID);
325 } 334 }
326 } 335 }
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 82b5968..7219bf8 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -1149,7 +1149,7 @@ namespace OpenSim.Framework
1149 1149
1150 void SendInstantMessage(GridInstantMessage im); 1150 void SendInstantMessage(GridInstantMessage im);
1151 1151
1152 void SendGenericMessage(string method, List<string> message); 1152 void SendGenericMessage(string method, List<byte[]> message);
1153 1153
1154 void SendLayerData(float[] map); 1154 void SendLayerData(float[] map);
1155 void SendLayerData(int px, int py, float[] map); 1155 void SendLayerData(int px, int py, float[] map);
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index ac38ac2..828bbfc 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -36,8 +36,295 @@ using OpenMetaverse;
36using OpenMetaverse.StructuredData; 36using OpenMetaverse.StructuredData;
37using OpenSim.Framework.Console; 37using OpenSim.Framework.Console;
38 38
39
39namespace OpenSim.Framework 40namespace OpenSim.Framework
40{ 41{
42 public class RegionMeta7WindlightData : ICloneable
43 {
44 public UUID regionID = UUID.Zero;
45 public Vector3 waterColor = new Vector3(4.0f,38.0f,64.0f);
46 public float waterFogDensityExponent = 4.0f;
47 public float underwaterFogModifier = 0.25f;
48 public Vector3 reflectionWaveletScale = new Vector3(2.0f,2.0f,2.0f);
49 public float fresnelScale = 0.40f;
50 public float fresnelOffset = 0.50f;
51 public float refractScaleAbove = 0.03f;
52 public float refractScaleBelow = 0.20f;
53 public float blurMultiplier = 0.040f;
54 public Vector2 bigWaveDirection = new Vector2(1.05f,-0.42f);
55 public Vector2 littleWaveDirection = new Vector2(1.11f,-1.16f);
56 public UUID normalMapTexture = new UUID("822ded49-9a6c-f61c-cb89-6df54f42cdf4");
57 public Vector4 horizon = new Vector4(0.25f, 0.25f, 0.32f, 0.32f);
58 public float hazeHorizon = 0.19f;
59 public Vector4 blueDensity = new Vector4(0.12f, 0.22f, 0.38f, 0.38f);
60 public float hazeDensity = 0.70f;
61 public float densityMultiplier = 0.18f;
62 public float distanceMultiplier = 0.8f;
63 public UInt16 maxAltitude = 1605;
64 public Vector4 sunMoonColor = new Vector4(0.24f, 0.26f, 0.30f, 0.30f);
65 public float sunMoonPosition = 0.317f;
66 public Vector4 ambient = new Vector4(0.35f,0.35f,0.35f,0.35f);
67 public float eastAngle = 0.0f;
68 public float sunGlowFocus = 0.10f;
69 public float sunGlowSize = 1.75f;
70 public float sceneGamma = 1.0f;
71 public float starBrightness = 0.0f;
72 public Vector4 cloudColor = new Vector4(0.41f, 0.41f, 0.41f, 0.41f);
73 public Vector3 cloudXYDensity = new Vector3(1.00f, 0.53f, 1.00f);
74 public float cloudCoverage = 0.27f;
75 public float cloudScale = 0.42f;
76 public Vector3 cloudDetailXYDensity = new Vector3(1.00f, 0.53f, 0.12f);
77 public float cloudScrollX = 0.20f;
78 public bool cloudScrollXLock = false;
79 public float cloudScrollY = 0.01f;
80 public bool cloudScrollYLock = false;
81 public bool drawClassicClouds = true;
82
83 public delegate void SaveDelegate(RegionMeta7WindlightData wl);
84 public event SaveDelegate OnSave;
85 public void Save()
86 {
87 if (OnSave != null)
88 OnSave(this);
89 }
90 public object Clone()
91 {
92 return this.MemberwiseClone(); // call clone method
93 }
94
95 }
96
97 [Serializable]
98 public class SimpleRegionInfo
99 {
100 // private static readonly log4net.ILog m_log
101 // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
102
103 /// <summary>
104 /// The port by which http communication occurs with the region (most noticeably, CAPS communication)
105 /// </summary>
106 public uint HttpPort
107 {
108 get { return m_httpPort; }
109 set { m_httpPort = value; }
110 }
111 protected uint m_httpPort;
112
113 /// <summary>
114 /// A well-formed URI for the host region server (namely "http://" + ExternalHostName)
115 /// </summary>
116 public string ServerURI
117 {
118 get { return m_serverURI; }
119 set { m_serverURI = value; }
120 }
121 protected string m_serverURI;
122
123 public string RegionName
124 {
125 get { return m_regionName; }
126 set { m_regionName = value; }
127 }
128 protected string m_regionName = String.Empty;
129
130 protected bool Allow_Alternate_Ports;
131 public bool m_allow_alternate_ports;
132 protected string m_externalHostName;
133
134 protected IPEndPoint m_internalEndPoint;
135 protected uint? m_regionLocX;
136 protected uint? m_regionLocY;
137 protected uint m_remotingPort;
138 public UUID RegionID = UUID.Zero;
139 public string RemotingAddress;
140 public UUID ScopeID = UUID.Zero;
141
142 public SimpleRegionInfo()
143 {
144 }
145
146 public SimpleRegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri)
147 {
148 m_regionLocX = regionLocX;
149 m_regionLocY = regionLocY;
150
151 m_internalEndPoint = internalEndPoint;
152 m_externalHostName = externalUri;
153 }
154
155 public SimpleRegionInfo(uint regionLocX, uint regionLocY, string externalUri, uint port)
156 {
157 m_regionLocX = regionLocX;
158 m_regionLocY = regionLocY;
159
160 m_externalHostName = externalUri;
161
162 m_internalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int) port);
163 }
164
165 public SimpleRegionInfo(RegionInfo ConvertFrom)
166 {
167 m_regionName = ConvertFrom.RegionName;
168 m_regionLocX = ConvertFrom.RegionLocX;
169 m_regionLocY = ConvertFrom.RegionLocY;
170 m_internalEndPoint = ConvertFrom.InternalEndPoint;
171 m_externalHostName = ConvertFrom.ExternalHostName;
172 m_remotingPort = ConvertFrom.RemotingPort;
173 m_httpPort = ConvertFrom.HttpPort;
174 m_allow_alternate_ports = ConvertFrom.m_allow_alternate_ports;
175 RemotingAddress = ConvertFrom.RemotingAddress;
176 RegionID = UUID.Zero;
177 ServerURI = ConvertFrom.ServerURI;
178 }
179
180 public uint RemotingPort
181 {
182 get { return m_remotingPort; }
183 set { m_remotingPort = value; }
184 }
185
186 /// <value>
187 /// This accessor can throw all the exceptions that Dns.GetHostAddresses can throw.
188 ///
189 /// XXX Isn't this really doing too much to be a simple getter, rather than an explict method?
190 /// </value>
191 public IPEndPoint ExternalEndPoint
192 {
193 get
194 {
195 // Old one defaults to IPv6
196 //return new IPEndPoint(Dns.GetHostAddresses(m_externalHostName)[0], m_internalEndPoint.Port);
197
198 IPAddress ia = null;
199 // If it is already an IP, don't resolve it - just return directly
200 if (IPAddress.TryParse(m_externalHostName, out ia))
201 return new IPEndPoint(ia, m_internalEndPoint.Port);
202
203 // Reset for next check
204 ia = null;
205 try
206 {
207 foreach (IPAddress Adr in Dns.GetHostAddresses(m_externalHostName))
208 {
209 if (ia == null)
210 ia = Adr;
211
212 if (Adr.AddressFamily == AddressFamily.InterNetwork)
213 {
214 ia = Adr;
215 break;
216 }
217 }
218 }
219 catch (SocketException e)
220 {
221 throw new Exception(
222 "Unable to resolve local hostname " + m_externalHostName + " innerException of type '" +
223 e + "' attached to this exception", e);
224 }
225
226 return new IPEndPoint(ia, m_internalEndPoint.Port);
227 }
228
229 set { m_externalHostName = value.ToString(); }
230 }
231
232 public string ExternalHostName
233 {
234 get { return m_externalHostName; }
235 set { m_externalHostName = value; }
236 }
237
238 public IPEndPoint InternalEndPoint
239 {
240 get { return m_internalEndPoint; }
241 set { m_internalEndPoint = value; }
242 }
243
244 public uint RegionLocX
245 {
246 get { return m_regionLocX.Value; }
247 set { m_regionLocX = value; }
248 }
249
250 public uint RegionLocY
251 {
252 get { return m_regionLocY.Value; }
253 set { m_regionLocY = value; }
254 }
255
256 public ulong RegionHandle
257 {
258 get { return Util.UIntsToLong((RegionLocX * (uint) Constants.RegionSize), (RegionLocY * (uint) Constants.RegionSize)); }
259 }
260
261 public int getInternalEndPointPort()
262 {
263 return m_internalEndPoint.Port;
264 }
265
266 public Dictionary<string, object> ToKeyValuePairs()
267 {
268 Dictionary<string, object> kvp = new Dictionary<string, object>();
269 kvp["uuid"] = RegionID.ToString();
270 kvp["locX"] = RegionLocX.ToString();
271 kvp["locY"] = RegionLocY.ToString();
272 kvp["external_ip_address"] = ExternalEndPoint.Address.ToString();
273 kvp["external_port"] = ExternalEndPoint.Port.ToString();
274 kvp["external_host_name"] = ExternalHostName;
275 kvp["http_port"] = HttpPort.ToString();
276 kvp["internal_ip_address"] = InternalEndPoint.Address.ToString();
277 kvp["internal_port"] = InternalEndPoint.Port.ToString();
278 kvp["alternate_ports"] = m_allow_alternate_ports.ToString();
279 kvp["server_uri"] = ServerURI;
280
281 return kvp;
282 }
283
284 public SimpleRegionInfo(Dictionary<string, object> kvp)
285 {
286 if ((kvp["external_ip_address"] != null) && (kvp["external_port"] != null))
287 {
288 int port = 0;
289 Int32.TryParse((string)kvp["external_port"], out port);
290 IPEndPoint ep = new IPEndPoint(IPAddress.Parse((string)kvp["external_ip_address"]), port);
291 ExternalEndPoint = ep;
292 }
293 else
294 ExternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0);
295
296 if (kvp["external_host_name"] != null)
297 ExternalHostName = (string)kvp["external_host_name"];
298
299 if (kvp["http_port"] != null)
300 {
301 UInt32 port = 0;
302 UInt32.TryParse((string)kvp["http_port"], out port);
303 HttpPort = port;
304 }
305
306 if ((kvp["internal_ip_address"] != null) && (kvp["internal_port"] != null))
307 {
308 int port = 0;
309 Int32.TryParse((string)kvp["internal_port"], out port);
310 IPEndPoint ep = new IPEndPoint(IPAddress.Parse((string)kvp["internal_ip_address"]), port);
311 InternalEndPoint = ep;
312 }
313 else
314 InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0);
315
316 if (kvp["alternate_ports"] != null)
317 {
318 bool alts = false;
319 Boolean.TryParse((string)kvp["alternate_ports"], out alts);
320 m_allow_alternate_ports = alts;
321 }
322
323 if (kvp["server_uri"] != null)
324 ServerURI = (string)kvp["server_uri"];
325 }
326 }
327
41 public class RegionInfo 328 public class RegionInfo
42 { 329 {
43 // private static readonly log4net.ILog m_log 330 // private static readonly log4net.ILog m_log
@@ -69,6 +356,7 @@ namespace OpenSim.Framework
69 private bool m_clampPrimSize = false; 356 private bool m_clampPrimSize = false;
70 private int m_objectCapacity = 0; 357 private int m_objectCapacity = 0;
71 private string m_regionType = String.Empty; 358 private string m_regionType = String.Empty;
359 private RegionMeta7WindlightData m_windlight = new RegionMeta7WindlightData();
72 protected uint m_httpPort; 360 protected uint m_httpPort;
73 protected string m_serverURI; 361 protected string m_serverURI;
74 protected string m_regionName = String.Empty; 362 protected string m_regionName = String.Empty;
@@ -207,6 +495,21 @@ namespace OpenSim.Framework
207 set { m_regionSettings = value; } 495 set { m_regionSettings = value; }
208 } 496 }
209 497
498 public RegionMeta7WindlightData WindlightSettings
499 {
500 get
501 {
502 if (m_windlight == null)
503 {
504 m_windlight = new RegionMeta7WindlightData();
505 }
506
507 return m_windlight;
508 }
509
510 set { m_windlight = value; }
511 }
512
210 public int NonphysPrimMax 513 public int NonphysPrimMax
211 { 514 {
212 get { return m_nonphysPrimMax; } 515 get { return m_nonphysPrimMax; }
diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs
index ec94b2d..f618047 100644
--- a/OpenSim/Framework/Servers/VersionInfo.cs
+++ b/OpenSim/Framework/Servers/VersionInfo.cs
@@ -29,9 +29,8 @@ namespace OpenSim
29{ 29{
30 public class VersionInfo 30 public class VersionInfo
31 { 31 {
32 private const string VERSION_NUMBER = "0.6.9"; 32 private const string VERSION_NUMBER = "0.6.8CM";
33 private const Flavour VERSION_FLAVOUR = Flavour.Dev; 33 private const Flavour VERSION_FLAVOUR = Flavour.Dev;
34
35 public enum Flavour 34 public enum Flavour
36 { 35 {
37 Unknown, 36 Unknown,
diff --git a/OpenSim/Framework/TaskInventoryDictionary.cs b/OpenSim/Framework/TaskInventoryDictionary.cs
index 25ae6b0..4b9a509 100644
--- a/OpenSim/Framework/TaskInventoryDictionary.cs
+++ b/OpenSim/Framework/TaskInventoryDictionary.cs
@@ -27,9 +27,12 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Threading;
31using System.Reflection;
30using System.Xml; 32using System.Xml;
31using System.Xml.Schema; 33using System.Xml.Schema;
32using System.Xml.Serialization; 34using System.Xml.Serialization;
35using log4net;
33using OpenMetaverse; 36using OpenMetaverse;
34 37
35namespace OpenSim.Framework 38namespace OpenSim.Framework
@@ -45,6 +48,111 @@ namespace OpenSim.Framework
45 // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 48 // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
46 49
47 private static XmlSerializer tiiSerializer = new XmlSerializer(typeof (TaskInventoryItem)); 50 private static XmlSerializer tiiSerializer = new XmlSerializer(typeof (TaskInventoryItem));
51 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
52
53 private Thread LockedByThread;
54 /// <value>
55 /// An advanced lock for inventory data
56 /// </value>
57 private System.Threading.ReaderWriterLockSlim m_itemLock = new System.Threading.ReaderWriterLockSlim();
58
59 /// <summary>
60 /// Are we readlocked by the calling thread?
61 /// </summary>
62 public bool IsReadLockedByMe()
63 {
64 if (m_itemLock.RecursiveReadCount > 0)
65 {
66 return true;
67 }
68 else
69 {
70 return false;
71 }
72 }
73
74 /// <summary>
75 /// Lock our inventory list for reading (many can read, one can write)
76 /// </summary>
77 public void LockItemsForRead(bool locked)
78 {
79 if (locked)
80 {
81 if (m_itemLock.IsWriteLockHeld && LockedByThread != null)
82 {
83 if (!LockedByThread.IsAlive)
84 {
85 //Locked by dead thread, reset.
86 m_itemLock = new System.Threading.ReaderWriterLockSlim();
87 }
88 }
89
90 if (m_itemLock.RecursiveReadCount > 0)
91 {
92 m_log.Error("[TaskInventoryDictionary] Recursive read lock requested. This should not happen and means something needs to be fixed. For now though, it's safe to continue.");
93 m_itemLock.ExitReadLock();
94 }
95 if (m_itemLock.RecursiveWriteCount > 0)
96 {
97 m_log.Error("[TaskInventoryDictionary] Recursive write lock requested. This should not happen and means something needs to be fixed.");
98 m_itemLock.ExitWriteLock();
99 }
100
101 while (!m_itemLock.TryEnterReadLock(60000))
102 {
103 m_log.Error("Thread lock detected while trying to aquire READ lock in TaskInventoryDictionary. Locked by thread " + LockedByThread.Name + ". I'm going to try to solve the thread lock automatically to preserve region stability, but this needs to be fixed.");
104 if (m_itemLock.IsWriteLockHeld)
105 {
106 m_itemLock = new System.Threading.ReaderWriterLockSlim();
107 }
108 }
109 }
110 else
111 {
112 if (m_itemLock.RecursiveReadCount>0)
113 {
114 m_itemLock.ExitReadLock();
115 }
116 }
117 }
118
119 /// <summary>
120 /// Lock our inventory list for writing (many can read, one can write)
121 /// </summary>
122 public void LockItemsForWrite(bool locked)
123 {
124 if (locked)
125 {
126 //Enter a write lock, wait indefinately for one to open.
127 if (m_itemLock.RecursiveReadCount > 0)
128 {
129 m_log.Error("[TaskInventoryDictionary] Recursive read lock requested. This should not happen and means something needs to be fixed. For now though, it's safe to continue.");
130 m_itemLock.ExitReadLock();
131 }
132 if (m_itemLock.RecursiveWriteCount > 0)
133 {
134 m_log.Error("[TaskInventoryDictionary] Recursive write lock requested. This should not happen and means something needs to be fixed.");
135 m_itemLock.ExitWriteLock();
136 }
137 while (!m_itemLock.TryEnterWriteLock(60000))
138 {
139 m_log.Error("Thread lock detected while trying to aquire WRITE lock in TaskInventoryDictionary. Locked by thread " + LockedByThread.Name + ". I'm going to try to solve the thread lock automatically to preserve region stability, but this needs to be fixed.");
140 if (m_itemLock.IsWriteLockHeld)
141 {
142 m_itemLock = new System.Threading.ReaderWriterLockSlim();
143 }
144 }
145
146 LockedByThread = Thread.CurrentThread;
147 }
148 else
149 {
150 if (m_itemLock.RecursiveWriteCount > 0)
151 {
152 m_itemLock.ExitWriteLock();
153 }
154 }
155 }
48 156
49 #region ICloneable Members 157 #region ICloneable Members
50 158
@@ -52,13 +160,12 @@ namespace OpenSim.Framework
52 { 160 {
53 TaskInventoryDictionary clone = new TaskInventoryDictionary(); 161 TaskInventoryDictionary clone = new TaskInventoryDictionary();
54 162
55 lock (this) 163 m_itemLock.EnterReadLock();
164 foreach (UUID uuid in Keys)
56 { 165 {
57 foreach (UUID uuid in Keys) 166 clone.Add(uuid, (TaskInventoryItem) this[uuid].Clone());
58 {
59 clone.Add(uuid, (TaskInventoryItem) this[uuid].Clone());
60 }
61 } 167 }
168 m_itemLock.ExitReadLock();
62 169
63 return clone; 170 return clone;
64 } 171 }
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 10af925..0ccc193 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -996,19 +996,19 @@ namespace OpenSim.Framework
996 { 996 {
997 string os = String.Empty; 997 string os = String.Empty;
998 998
999 if (Environment.OSVersion.Platform != PlatformID.Unix) 999// if (Environment.OSVersion.Platform != PlatformID.Unix)
1000 { 1000// {
1001 os = Environment.OSVersion.ToString(); 1001// os = Environment.OSVersion.ToString();
1002 } 1002// }
1003 else 1003// else
1004 { 1004// {
1005 os = ReadEtcIssue(); 1005// os = ReadEtcIssue();
1006 } 1006// }
1007 1007//
1008 if (os.Length > 45) 1008// if (os.Length > 45)
1009 { 1009// {
1010 os = os.Substring(0, 45); 1010// os = os.Substring(0, 45);
1011 } 1011// }
1012 1012
1013 return os; 1013 return os;
1014 } 1014 }
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index ef49205..1696037 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -820,16 +820,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
820 } 820 }
821 } 821 }
822 822
823 public void SendGenericMessage(string method, List<string> message) 823 public void SendGenericMessage(string method, List<byte[]> message)
824 { 824 {
825 GenericMessagePacket gmp = new GenericMessagePacket(); 825 GenericMessagePacket gmp = new GenericMessagePacket();
826 gmp.MethodData.Method = Util.StringToBytes256(method); 826 gmp.MethodData.Method = Util.StringToBytes256(method);
827 gmp.ParamList = new GenericMessagePacket.ParamListBlock[message.Count]; 827 gmp.ParamList = new GenericMessagePacket.ParamListBlock[message.Count];
828 int i = 0; 828 int i = 0;
829 foreach (string val in message) 829 foreach (byte[] val in message)
830 { 830 {
831 gmp.ParamList[i] = new GenericMessagePacket.ParamListBlock(); 831 gmp.ParamList[i] = new GenericMessagePacket.ParamListBlock();
832 gmp.ParamList[i++].Parameter = Util.StringToBytes256(val); 832 gmp.ParamList[i++].Parameter = val;
833 } 833 }
834 OutPacket(gmp, ThrottleOutPacketType.Task); 834 OutPacket(gmp, ThrottleOutPacketType.Task);
835 } 835 }
@@ -1028,6 +1028,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1028 public virtual void SendLayerData(float[] map) 1028 public virtual void SendLayerData(float[] map)
1029 { 1029 {
1030 Util.FireAndForget(DoSendLayerData, map); 1030 Util.FireAndForget(DoSendLayerData, map);
1031
1032 // Send it sync, and async. It's not that much data
1033 // and it improves user experience just so much!
1034 DoSendLayerData(map);
1031 } 1035 }
1032 1036
1033 /// <summary> 1037 /// <summary>
@@ -1040,16 +1044,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1040 1044
1041 try 1045 try
1042 { 1046 {
1043 //for (int y = 0; y < 16; y++) 1047 for (int y = 0; y < 16; y++)
1044 //{ 1048 {
1045 // for (int x = 0; x < 16; x++) 1049 for (int x = 0; x < 16; x+=4)
1046 // { 1050 {
1047 // SendLayerData(x, y, map); 1051 SendLayerPacket(x, y, map);
1048 // } 1052 }
1049 //} 1053 }
1050
1051 // Send LayerData in a spiral pattern. Fun!
1052 SendLayerTopRight(map, 0, 0, 15, 15);
1053 } 1054 }
1054 catch (Exception e) 1055 catch (Exception e)
1055 { 1056 {
@@ -1057,51 +1058,35 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1057 } 1058 }
1058 } 1059 }
1059 1060
1060 private void SendLayerTopRight(float[] map, int x1, int y1, int x2, int y2)
1061 {
1062 // Row
1063 for (int i = x1; i <= x2; i++)
1064 SendLayerData(i, y1, map);
1065
1066 // Column
1067 for (int j = y1 + 1; j <= y2; j++)
1068 SendLayerData(x2, j, map);
1069
1070 if (x2 - x1 > 0)
1071 SendLayerBottomLeft(map, x1, y1 + 1, x2 - 1, y2);
1072 }
1073
1074 void SendLayerBottomLeft(float[] map, int x1, int y1, int x2, int y2)
1075 {
1076 // Row in reverse
1077 for (int i = x2; i >= x1; i--)
1078 SendLayerData(i, y2, map);
1079
1080 // Column in reverse
1081 for (int j = y2 - 1; j >= y1; j--)
1082 SendLayerData(x1, j, map);
1083
1084 if (x2 - x1 > 0)
1085 SendLayerTopRight(map, x1 + 1, y1, x2, y2 - 1);
1086 }
1087
1088 /// <summary> 1061 /// <summary>
1089 /// Sends a set of four patches (x, x+1, ..., x+3) to the client 1062 /// Sends a set of four patches (x, x+1, ..., x+3) to the client
1090 /// </summary> 1063 /// </summary>
1091 /// <param name="map">heightmap</param> 1064 /// <param name="map">heightmap</param>
1092 /// <param name="px">X coordinate for patches 0..12</param> 1065 /// <param name="px">X coordinate for patches 0..12</param>
1093 /// <param name="py">Y coordinate for patches 0..15</param> 1066 /// <param name="py">Y coordinate for patches 0..15</param>
1094 // private void SendLayerPacket(float[] map, int y, int x) 1067 private void SendLayerPacket(int x, int y, float[] map)
1095 // { 1068 {
1096 // int[] patches = new int[4]; 1069 int[] patches = new int[4];
1097 // patches[0] = x + 0 + y * 16; 1070 patches[0] = x + 0 + y * 16;
1098 // patches[1] = x + 1 + y * 16; 1071 patches[1] = x + 1 + y * 16;
1099 // patches[2] = x + 2 + y * 16; 1072 patches[2] = x + 2 + y * 16;
1100 // patches[3] = x + 3 + y * 16; 1073 patches[3] = x + 3 + y * 16;
1101 1074
1102 // Packet layerpack = LLClientView.TerrainManager.CreateLandPacket(map, patches); 1075 float[] heightmap = (map.Length == 65536) ?
1103 // OutPacket(layerpack, ThrottleOutPacketType.Land); 1076 map :
1104 // } 1077 LLHeightFieldMoronize(map);
1078
1079 try
1080 {
1081 Packet layerpack = TerrainCompressor.CreateLandPacket(heightmap, patches);
1082 OutPacket(layerpack, ThrottleOutPacketType.Land);
1083 }
1084 catch
1085 {
1086 for (int px = x ; px < x + 4 ; px++)
1087 SendLayerData(px, y, map);
1088 }
1089 }
1105 1090
1106 /// <summary> 1091 /// <summary>
1107 /// Sends a specified patch to a client 1092 /// Sends a specified patch to a client
@@ -1121,7 +1106,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1121 LayerDataPacket layerpack = TerrainCompressor.CreateLandPacket(heightmap, patches); 1106 LayerDataPacket layerpack = TerrainCompressor.CreateLandPacket(heightmap, patches);
1122 layerpack.Header.Reliable = true; 1107 layerpack.Header.Reliable = true;
1123 1108
1124 OutPacket(layerpack, ThrottleOutPacketType.Land); 1109 OutPacket(layerpack, ThrottleOutPacketType.Task);
1125 } 1110 }
1126 catch (Exception e) 1111 catch (Exception e)
1127 { 1112 {
@@ -3388,7 +3373,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3388 3373
3389 objupdate.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1]; 3374 objupdate.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];
3390 objupdate.ObjectData[0] = CreateAvatarUpdateBlock(data); 3375 objupdate.ObjectData[0] = CreateAvatarUpdateBlock(data);
3391
3392 OutPacket(objupdate, ThrottleOutPacketType.Task); 3376 OutPacket(objupdate, ThrottleOutPacketType.Task);
3393 } 3377 }
3394 3378
@@ -3439,8 +3423,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3439 terse.ObjectData[i] = m_avatarTerseUpdates.Dequeue(); 3423 terse.ObjectData[i] = m_avatarTerseUpdates.Dequeue();
3440 } 3424 }
3441 3425
3442 // HACK: Using the task category until the tiered reprioritization code is in 3426 OutPacket(terse, ThrottleOutPacketType.State);
3443 OutPacket(terse, ThrottleOutPacketType.Task);
3444 } 3427 }
3445 3428
3446 public void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations) 3429 public void SendCoarseLocationUpdate(List<UUID> users, List<Vector3> CoarseLocations)
@@ -3917,6 +3900,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3917 { 3900 {
3918 m_propertiesPacketTimer.Stop(); 3901 m_propertiesPacketTimer.Stop();
3919 3902
3903 if (m_propertiesBlocks.Count == 0)
3904 return;
3905
3920 proper.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[m_propertiesBlocks.Count]; 3906 proper.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[m_propertiesBlocks.Count];
3921 3907
3922 int index = 0; 3908 int index = 0;
@@ -4854,6 +4840,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4854 (x.CameraLeftAxis != lastarg.CameraLeftAxis) || 4840 (x.CameraLeftAxis != lastarg.CameraLeftAxis) ||
4855 (x.CameraUpAxis != lastarg.CameraUpAxis) || 4841 (x.CameraUpAxis != lastarg.CameraUpAxis) ||
4856 (x.ControlFlags != lastarg.ControlFlags) || 4842 (x.ControlFlags != lastarg.ControlFlags) ||
4843 (x.ControlFlags != 0) ||
4857 (x.Far != lastarg.Far) || 4844 (x.Far != lastarg.Far) ||
4858 (x.Flags != lastarg.Flags) || 4845 (x.Flags != lastarg.Flags) ||
4859 (x.State != lastarg.State) || 4846 (x.State != lastarg.State) ||
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
index 6dacbba..acc3a78 100644
--- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
@@ -49,7 +49,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
49 private int m_shoutdistance = 100; 49 private int m_shoutdistance = 100;
50 private int m_whisperdistance = 10; 50 private int m_whisperdistance = 10;
51 private List<Scene> m_scenes = new List<Scene>(); 51 private List<Scene> m_scenes = new List<Scene>();
52 52 private List<string> FreezeCache = new List<string>();
53 private string m_adminPrefix = "";
53 internal object m_syncy = new object(); 54 internal object m_syncy = new object();
54 55
55 internal IConfig m_config; 56 internal IConfig m_config;
@@ -76,6 +77,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
76 m_whisperdistance = config.Configs["Chat"].GetInt("whisper_distance", m_whisperdistance); 77 m_whisperdistance = config.Configs["Chat"].GetInt("whisper_distance", m_whisperdistance);
77 m_saydistance = config.Configs["Chat"].GetInt("say_distance", m_saydistance); 78 m_saydistance = config.Configs["Chat"].GetInt("say_distance", m_saydistance);
78 m_shoutdistance = config.Configs["Chat"].GetInt("shout_distance", m_shoutdistance); 79 m_shoutdistance = config.Configs["Chat"].GetInt("shout_distance", m_shoutdistance);
80 m_adminPrefix = config.Configs["Chat"].GetString("admin_prefix", "");
79 } 81 }
80 82
81 public virtual void AddRegion(Scene scene) 83 public virtual void AddRegion(Scene scene)
@@ -171,7 +173,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
171 return; 173 return;
172 } 174 }
173 175
174 DeliverChatToAvatars(ChatSourceType.Agent, c); 176 if (FreezeCache.Contains(c.Sender.AgentId.ToString()))
177 {
178 if (c.Type != ChatTypeEnum.StartTyping || c.Type != ChatTypeEnum.StopTyping)
179 c.Sender.SendAgentAlertMessage("You may not talk as you are frozen.", false);
180 }
181 else
182 {
183 DeliverChatToAvatars(ChatSourceType.Agent, c);
184 }
175 } 185 }
176 186
177 public virtual void OnChatFromWorld(Object sender, OSChatMessage c) 187 public virtual void OnChatFromWorld(Object sender, OSChatMessage c)
@@ -185,6 +195,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
185 protected virtual void DeliverChatToAvatars(ChatSourceType sourceType, OSChatMessage c) 195 protected virtual void DeliverChatToAvatars(ChatSourceType sourceType, OSChatMessage c)
186 { 196 {
187 string fromName = c.From; 197 string fromName = c.From;
198 string fromNamePrefix = "";
188 UUID fromID = UUID.Zero; 199 UUID fromID = UUID.Zero;
189 string message = c.Message; 200 string message = c.Message;
190 IScene scene = c.Scene; 201 IScene scene = c.Scene;
@@ -207,7 +218,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
207 fromPos = avatar.AbsolutePosition; 218 fromPos = avatar.AbsolutePosition;
208 fromName = avatar.Name; 219 fromName = avatar.Name;
209 fromID = c.Sender.AgentId; 220 fromID = c.Sender.AgentId;
210 221 if (avatar.GodLevel > 200)
222 {
223 fromNamePrefix = m_adminPrefix;
224 }
211 break; 225 break;
212 226
213 case ChatSourceType.Object: 227 case ChatSourceType.Object:
@@ -227,7 +241,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
227 s.ForEachScenePresence( 241 s.ForEachScenePresence(
228 delegate(ScenePresence presence) 242 delegate(ScenePresence presence)
229 { 243 {
230 TrySendChatMessage(presence, fromPos, regionPos, fromID, fromName, c.Type, message, sourceType); 244 ILandObject Presencecheck = s.LandChannel.GetLandObject(presence.AbsolutePosition.X, presence.AbsolutePosition.Y);
245 if (Presencecheck != null)
246 {
247 if (Presencecheck.IsEitherBannedOrRestricted(c.SenderUUID) != true)
248 {
249 TrySendChatMessage(presence, fromPos, regionPos, fromID, fromNamePrefix+fromName, c.Type, message, sourceType);
250 }
251 }
252
231 } 253 }
232 ); 254 );
233 } 255 }
@@ -266,25 +288,29 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
266 } 288 }
267 289
268 // m_log.DebugFormat("[CHAT] Broadcast: fromID {0} fromName {1}, cType {2}, sType {3}", fromID, fromName, cType, sourceType); 290 // m_log.DebugFormat("[CHAT] Broadcast: fromID {0} fromName {1}, cType {2}, sType {3}", fromID, fromName, cType, sourceType);
269 291 if (c.Scene != null)
270 ((Scene)c.Scene).ForEachScenePresence( 292 {
271 delegate(ScenePresence presence) 293 ((Scene)c.Scene).ForEachScenePresence
272 { 294 (
273 // ignore chat from child agents 295 delegate(ScenePresence presence)
274 if (presence.IsChildAgent) return; 296 {
275 297 // ignore chat from child agents
276 IClientAPI client = presence.ControllingClient; 298 if (presence.IsChildAgent) return;
277 299
278 // don't forward SayOwner chat from objects to 300 IClientAPI client = presence.ControllingClient;
279 // non-owner agents 301
280 if ((c.Type == ChatTypeEnum.Owner) && 302 // don't forward SayOwner chat from objects to
281 (null != c.SenderObject) && 303 // non-owner agents
282 (((SceneObjectPart)c.SenderObject).OwnerID != client.AgentId)) 304 if ((c.Type == ChatTypeEnum.Owner) &&
283 return; 305 (null != c.SenderObject) &&
284 306 (((SceneObjectPart)c.SenderObject).OwnerID != client.AgentId))
285 client.SendChatMessage(c.Message, (byte)cType, CenterOfRegion, fromName, fromID, 307 return;
286 (byte)sourceType, (byte)ChatAudibleLevel.Fully); 308
287 }); 309 client.SendChatMessage(c.Message, (byte)cType, CenterOfRegion, fromName, fromID,
310 (byte)sourceType, (byte)ChatAudibleLevel.Fully);
311 }
312 );
313 }
288 } 314 }
289 315
290 316
@@ -313,5 +339,35 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
313 presence.ControllingClient.SendChatMessage(message, (byte) type, fromPos, fromName, 339 presence.ControllingClient.SendChatMessage(message, (byte) type, fromPos, fromName,
314 fromAgentID,(byte)src,(byte)ChatAudibleLevel.Fully); 340 fromAgentID,(byte)src,(byte)ChatAudibleLevel.Fully);
315 } 341 }
342
343 Dictionary<UUID, System.Threading.Timer> Timers = new Dictionary<UUID, System.Threading.Timer>();
344 public void ParcelFreezeUser(IClientAPI client, UUID parcelowner, uint flags, UUID target)
345 {
346 System.Threading.Timer Timer;
347 if (flags == 0)
348 {
349 FreezeCache.Add(target.ToString());
350 System.Threading.TimerCallback timeCB = new System.Threading.TimerCallback(OnEndParcelFrozen);
351 Timer = new System.Threading.Timer(timeCB, target, 30000, 0);
352 Timers.Add(target, Timer);
353 }
354 else
355 {
356 FreezeCache.Remove(target.ToString());
357 Timers.TryGetValue(target, out Timer);
358 Timers.Remove(target);
359 Timer.Dispose();
360 }
361 }
362
363 private void OnEndParcelFrozen(object avatar)
364 {
365 UUID target = (UUID)avatar;
366 FreezeCache.Remove(target.ToString());
367 System.Threading.Timer Timer;
368 Timers.TryGetValue(target, out Timer);
369 Timers.Remove(target);
370 Timer.Dispose();
371 }
316 } 372 }
317} 373}
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
index fdfcd10..9412735 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
@@ -172,13 +172,16 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
172 172
173 private void RetrieveInstantMessages(IClientAPI client) 173 private void RetrieveInstantMessages(IClientAPI client)
174 { 174 {
175 if (m_RestURL != "") 175 if (m_RestURL == String.Empty)
176 { 176 return;
177 m_log.DebugFormat("[OFFLINE MESSAGING] Retrieving stored messages for {0}", client.AgentId);
178 177
179 List<GridInstantMessage> msglist = SynchronousRestObjectPoster.BeginPostObject<UUID, List<GridInstantMessage>>( 178 m_log.DebugFormat("[OFFLINE MESSAGING] Retrieving stored messages for {0}", client.AgentId);
179
180 List<GridInstantMessage> msglist = SynchronousRestObjectPoster.BeginPostObject<UUID, List<GridInstantMessage>>(
180 "POST", m_RestURL + "/RetrieveMessages/", client.AgentId); 181 "POST", m_RestURL + "/RetrieveMessages/", client.AgentId);
181 182
183 if (msglist != null)
184 {
182 foreach (GridInstantMessage im in msglist) 185 foreach (GridInstantMessage im in msglist)
183 { 186 {
184 // client.SendInstantMessage(im); 187 // client.SendInstantMessage(im);
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index 4f03b0e..09552a8 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -417,7 +417,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
417 { 417 {
418 // Check if this is ours to handle 418 // Check if this is ours to handle
419 // 419 //
420 m_log.Info("OnFridInstantMessage"); 420 //m_log.Info("OnFridInstantMessage");
421 if (msg.dialog != (byte) InstantMessageDialog.InventoryOffered) 421 if (msg.dialog != (byte) InstantMessageDialog.InventoryOffered)
422 return; 422 return;
423 423
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index b1b2336f8..14bab6e 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -256,10 +256,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver
256 // Fix ownership/creator of inventory items 256 // Fix ownership/creator of inventory items
257 // Not doing so results in inventory items 257 // Not doing so results in inventory items
258 // being no copy/no mod for everyone 258 // being no copy/no mod for everyone
259 lock (part.TaskInventory) 259 part.TaskInventory.LockItemsForRead(true);
260 TaskInventoryDictionary inv = part.TaskInventory;
261 foreach (KeyValuePair<UUID, TaskInventoryItem> kvp in inv)
260 { 262 {
261 TaskInventoryDictionary inv = part.TaskInventory; 263 if (!ResolveUserUuid(kvp.Value.OwnerID))
262 foreach (KeyValuePair<UUID, TaskInventoryItem> kvp in inv)
263 { 264 {
264 if (!ResolveUserUuid(kvp.Value.OwnerID)) 265 if (!ResolveUserUuid(kvp.Value.OwnerID))
265 { 266 {
@@ -271,6 +272,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
271 } 272 }
272 } 273 }
273 } 274 }
275 part.TaskInventory.LockItemsForRead(false);
274 } 276 }
275 277
276 if (m_scene.AddRestoredSceneObject(sceneObject, true, false)) 278 if (m_scene.AddRestoredSceneObject(sceneObject, true, false))
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index f0c87f4..ef3e722 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -81,6 +81,8 @@ namespace OpenSim.Region.CoreModules.World.Land
81 private int m_lastLandLocalID = LandChannel.START_LAND_LOCAL_ID - 1; 81 private int m_lastLandLocalID = LandChannel.START_LAND_LOCAL_ID - 1;
82 82
83 private bool m_allowedForcefulBans = true; 83 private bool m_allowedForcefulBans = true;
84 private UUID DefaultGodParcelGroup;
85 private string DefaultGodParcelName;
84 86
85 // caches ExtendedLandData 87 // caches ExtendedLandData
86 private Cache parcelInfoCache; 88 private Cache parcelInfoCache;
@@ -94,6 +96,12 @@ namespace OpenSim.Region.CoreModules.World.Land
94 96
95 public void Initialise(IConfigSource source) 97 public void Initialise(IConfigSource source)
96 { 98 {
99 IConfig cnf = source.Configs["LandManagement"];
100 if (cnf != null)
101 {
102 DefaultGodParcelGroup = new UUID(cnf.GetString("DefaultAdministratorGroupUUID", UUID.Zero.ToString()));
103 DefaultGodParcelName = cnf.GetString("DefaultAdministratorParcelName", "Default Parcel");
104 }
97 } 105 }
98 106
99 public void AddRegion(Scene scene) 107 public void AddRegion(Scene scene)
@@ -153,6 +161,10 @@ namespace OpenSim.Region.CoreModules.World.Land
153 client.OnParcelInfoRequest += ClientOnParcelInfoRequest; 161 client.OnParcelInfoRequest += ClientOnParcelInfoRequest;
154 client.OnParcelDwellRequest += ClientOnParcelDwellRequest; 162 client.OnParcelDwellRequest += ClientOnParcelDwellRequest;
155 client.OnParcelDeedToGroup += ClientOnParcelDeedToGroup; 163 client.OnParcelDeedToGroup += ClientOnParcelDeedToGroup;
164 client.OnParcelGodMark += ClientOnParcelGodMark;
165 client.OnSimWideDeletes += ClientOnSimWideDeletes;
166 client.OnParcelFreezeUser += ClientOnParcelFreezeUser;
167 client.OnParcelEjectUser += ClientOnParcelEjectUser;
156 168
157 EntityBase presenceEntity; 169 EntityBase presenceEntity;
158 if (m_scene.Entities.TryGetValue(client.AgentId, out presenceEntity) && presenceEntity is ScenePresence) 170 if (m_scene.Entities.TryGetValue(client.AgentId, out presenceEntity) && presenceEntity is ScenePresence)
@@ -261,20 +273,103 @@ namespace OpenSim.Region.CoreModules.World.Land
261 return parcelsNear; 273 return parcelsNear;
262 } 274 }
263 275
264 public void SendYouAreBannedNotice(ScenePresence avatar) 276
277 public void MoveUserOutOfParcel(ScenePresence avatar)
265 { 278 {
266 if (AllowedForcefulBans) 279 if (avatar.GodLevel == 0)
267 { 280 {
268 avatar.ControllingClient.SendAlertMessage( 281 ILandObject land = m_scene.LandChannel.GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y);
269 "You are not allowed on this parcel because you are banned. Please go away."); 282 List<ILandObject> parcelsNear = new List<ILandObject>();
270 283
271 avatar.PhysicsActor.Position = avatar.lastKnownAllowedPosition; 284 for (int x = -2; x <= 2; x += 2)
272 avatar.PhysicsActor.Velocity = Vector3.Zero; 285 {
273 } 286 ILandObject check = GetLandObject(avatar.AbsolutePosition.X + x, avatar.AbsolutePosition.Y);
274 else 287 if (check != null)
275 { 288 {
276 avatar.ControllingClient.SendAlertMessage( 289 if (check.IsEitherBannedOrRestricted(avatar.UUID) != true)
277 "You are not allowed on this parcel because you are banned; however, the grid administrator has disabled ban lines globally. Please obey the land owner's requests or you can be banned from the entire sim!"); 290 {
291 Vector3 target = new Vector3(avatar.AbsolutePosition.X + x, avatar.AbsolutePosition.Y, avatar.AbsolutePosition.Z);
292 avatar.TeleportWithMomentum(target);
293 return;
294 }
295 }
296 }
297 for (int y = -2; y <= 2; y += 2)
298 {
299 ILandObject check = GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y + y);
300 if (check != null)
301 {
302 if (check.IsEitherBannedOrRestricted(avatar.UUID) != true)
303 {
304 Vector3 target = new Vector3(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y + y, avatar.AbsolutePosition.Z);
305 avatar.TeleportWithMomentum(target);
306 return;
307 }
308 }
309 }
310 List<ILandObject> allParcels = new List<ILandObject>();
311 allParcels = AllParcels();
312 if (allParcels.Count != 1)
313 {
314 foreach (ILandObject parcel in allParcels)
315 {
316 if (parcel.IsEitherBannedOrRestricted(avatar.UUID) != true)
317 {
318 Vector3 temptarget = parcel.LandData.UserLocation;
319 if (parcel.ContainsPoint((int)parcel.LandData.UserLocation.X, (int)parcel.LandData.UserLocation.Y))
320 {
321 avatar.TeleportWithMomentum(temptarget);
322 return;
323 }
324 else
325 {
326 for (int x = 0; x <= Constants.RegionSize / 3; x += 3)
327 {
328 for (int y = 0; y <= Constants.RegionSize / 3; y += 3)
329 {
330 if (parcel.ContainsPoint(x, y))
331 {
332 temptarget = new Vector3(x, y, avatar.AbsolutePosition.Z);
333 avatar.TeleportWithMomentum(temptarget);
334 return;
335 }
336 }
337 }
338 }
339 }
340 }
341 }
342 //Move to region side
343 if (avatar.AbsolutePosition.X > avatar.AbsolutePosition.Y)
344 {
345 if (avatar.AbsolutePosition.X > .5 * Constants.RegionSize)
346 {
347 Vector3 target = new Vector3(Constants.RegionSize, avatar.AbsolutePosition.Y, avatar.AbsolutePosition.Z); ;
348 avatar.TeleportWithMomentum(target);
349 return;
350 }
351 else
352 {
353 Vector3 target = new Vector3(0, avatar.AbsolutePosition.Y, avatar.AbsolutePosition.Z); ;
354 avatar.TeleportWithMomentum(target);
355 return;
356 }
357 }
358 else
359 {
360 if (avatar.AbsolutePosition.Y > .5 * Constants.RegionSize)
361 {
362 Vector3 target = new Vector3(avatar.AbsolutePosition.X, Constants.RegionSize, avatar.AbsolutePosition.Z); ;
363 avatar.TeleportWithMomentum(target);
364 return;
365 }
366 else
367 {
368 Vector3 target = new Vector3(avatar.AbsolutePosition.X, 0, avatar.AbsolutePosition.Z); ;
369 avatar.TeleportWithMomentum(target);
370 return;
371 }
372 }
278 } 373 }
279 } 374 }
280 375
@@ -294,16 +389,7 @@ namespace OpenSim.Region.CoreModules.World.Land
294 { 389 {
295 if (parcelAvatarIsEntering.IsBannedFromLand(avatar.UUID)) 390 if (parcelAvatarIsEntering.IsBannedFromLand(avatar.UUID))
296 { 391 {
297 SendYouAreBannedNotice(avatar); 392 MoveUserOutOfParcel(avatar);
298 }
299 else if (parcelAvatarIsEntering.IsRestrictedFromLand(avatar.UUID))
300 {
301 avatar.ControllingClient.SendAlertMessage(
302 "You are not allowed on this parcel because the land owner has restricted access. For now, you can enter, but please respect the land owner's decisions (or he can ban you!).");
303 }
304 else
305 {
306 avatar.sentMessageAboutRestrictedParcelFlyingDown = true;
307 } 393 }
308 } 394 }
309 else 395 else
@@ -314,28 +400,47 @@ namespace OpenSim.Region.CoreModules.World.Land
314 } 400 }
315 } 401 }
316 402
317 public void SendOutNearestBanLine(IClientAPI avatar) 403 public void SendOutNearestBanLine(ScenePresence avatar)
318 { 404 {
319 List<ScenePresence> avatars = m_scene.GetAvatars(); 405 ILandObject checkBan = null;
320 foreach (ScenePresence presence in avatars) 406 for (int x = -2; x <= 2; x += 2)
321 { 407 {
322 if (presence.UUID == avatar.AgentId) 408 checkBan = GetLandObject(avatar.AbsolutePosition.X + x, avatar.AbsolutePosition.Y);
409 if (checkBan != null)
323 { 410 {
324 List<ILandObject> checkLandParcels = ParcelsNearPoint(presence.AbsolutePosition); 411 if (avatar.AbsolutePosition.Z < LandChannel.BAN_LINE_SAFETY_HIEGHT)
325 foreach (ILandObject checkBan in checkLandParcels)
326 { 412 {
327 if (checkBan.IsBannedFromLand(avatar.AgentId)) 413 if (checkBan.IsRestrictedFromLand(avatar.ControllingClient.AgentId))
328 { 414 {
329 checkBan.SendLandProperties((int)ParcelPropertiesStatus.CollisionBanned, false, (int)ParcelResult.Single, avatar); 415 checkBan.SendLandProperties((int)ParcelPropertiesStatus.CollisionNotOnAccessList, true, (int)ParcelResult.Multiple, avatar.ControllingClient);
330 return; //Only send one 416 return;
331 } 417 }
332 if (checkBan.IsRestrictedFromLand(avatar.AgentId)) 418 if (checkBan.IsBannedFromLand(avatar.ControllingClient.AgentId))
333 { 419 {
334 checkBan.SendLandProperties((int)ParcelPropertiesStatus.CollisionNotOnAccessList, false, (int)ParcelResult.Single, avatar); 420 checkBan.SendLandProperties((int)ParcelPropertiesStatus.CollisionBanned, true, (int)ParcelResult.Multiple, avatar.ControllingClient);
335 return; //Only send one 421 return;
422 }
423 }
424 }
425 }
426 for (int y = -2; y <= 2; y += 2)
427 {
428 checkBan = GetLandObject(avatar.AbsolutePosition.X, avatar.AbsolutePosition.Y + y);
429 if (checkBan != null)
430 {
431 if (avatar.AbsolutePosition.Z < LandChannel.BAN_LINE_SAFETY_HIEGHT)
432 {
433 if (checkBan.IsRestrictedFromLand(avatar.ControllingClient.AgentId))
434 {
435 checkBan.SendLandProperties((int)ParcelPropertiesStatus.CollisionNotOnAccessList, true, (int)ParcelResult.Multiple, avatar.ControllingClient);
436 return;
437 }
438 if (checkBan.IsBannedFromLand(avatar.ControllingClient.AgentId))
439 {
440 checkBan.SendLandProperties((int)ParcelPropertiesStatus.CollisionBanned, true, (int)ParcelResult.Multiple, avatar.ControllingClient);
441 return;
336 } 442 }
337 } 443 }
338 return;
339 } 444 }
340 } 445 }
341 } 446 }
@@ -382,25 +487,14 @@ namespace OpenSim.Region.CoreModules.World.Land
382 if (clientAvatar != null) 487 if (clientAvatar != null)
383 { 488 {
384 SendLandUpdate(clientAvatar); 489 SendLandUpdate(clientAvatar);
385 SendOutNearestBanLine(remote_client); 490 SendOutNearestBanLine(clientAvatar);
386 ILandObject parcel = GetLandObject(clientAvatar.AbsolutePosition.X, clientAvatar.AbsolutePosition.Y); 491 ILandObject parcel = GetLandObject(clientAvatar.AbsolutePosition.X, clientAvatar.AbsolutePosition.Y);
387 if (parcel != null) 492 if (parcel != null)
388 { 493 {
389 if (clientAvatar.AbsolutePosition.Z < LandChannel.BAN_LINE_SAFETY_HIEGHT && 494 if (clientAvatar.AbsolutePosition.Z < LandChannel.BAN_LINE_SAFETY_HIEGHT &&
390 clientAvatar.sentMessageAboutRestrictedParcelFlyingDown)
391 {
392 EventManagerOnAvatarEnteringNewParcel(clientAvatar, parcel.LandData.LocalID,
393 m_scene.RegionInfo.RegionID);
394 //They are going under the safety line!
395 if (!parcel.IsBannedFromLand(clientAvatar.UUID))
396 {
397 clientAvatar.sentMessageAboutRestrictedParcelFlyingDown = false;
398 }
399 }
400 else if (clientAvatar.AbsolutePosition.Z < LandChannel.BAN_LINE_SAFETY_HIEGHT &&
401 parcel.IsBannedFromLand(clientAvatar.UUID)) 495 parcel.IsBannedFromLand(clientAvatar.UUID))
402 { 496 {
403 SendYouAreBannedNotice(clientAvatar); 497 MoveUserOutOfParcel(clientAvatar);
404 } 498 }
405 } 499 }
406 } 500 }
@@ -448,9 +542,21 @@ namespace OpenSim.Region.CoreModules.World.Land
448 542
449 if (land != null) 543 if (land != null)
450 { 544 {
451 if (agentID == land.LandData.OwnerID) 545 if (m_scene.Permissions.CanEditParcel(agentID, land))
452 { 546 {
453 land.UpdateAccessList(flags, entries, remote_client); 547 land.UpdateAccessList(flags, entries, remote_client);
548 List<ScenePresence> presences = ((Scene)remote_client.Scene).GetAvatars();
549 foreach (ScenePresence presence in presences)
550 {
551 land = GetLandObject(presence.AbsolutePosition.X, presence.AbsolutePosition.Y);
552 if (land != null)
553 {
554 if (land.IsEitherBannedOrRestricted(presence.UUID))
555 {
556 MoveUserOutOfParcel(presence);
557 }
558 }
559 }
454 } 560 }
455 } 561 }
456 else 562 else
@@ -1016,7 +1122,25 @@ namespace OpenSim.Region.CoreModules.World.Land
1016 m_landList.TryGetValue(localID, out land); 1122 m_landList.TryGetValue(localID, out land);
1017 } 1123 }
1018 1124
1019 if (land != null) land.UpdateLandProperties(args, remote_client); 1125 if (land != null)
1126 {
1127 land.UpdateLandProperties(args, remote_client);
1128 if ((args.ParcelFlags & (uint)(ParcelFlags.UseBanList | ParcelFlags.UseAccessList | ParcelFlags.UseAccessGroup | ParcelFlags.UsePassList)) != 0)
1129 {
1130 List<ScenePresence> presences = ((Scene)remote_client.Scene).GetAvatars();
1131 foreach (ScenePresence presence in presences)
1132 {
1133 land = GetLandObject(presence.AbsolutePosition.X, presence.AbsolutePosition.Y);
1134 if (land != null)
1135 {
1136 if (land.IsEitherBannedOrRestricted(presence.UUID))
1137 {
1138 MoveUserOutOfParcel(presence);
1139 }
1140 }
1141 }
1142 }
1143 }
1020 } 1144 }
1021 1145
1022 public void ClientOnParcelDivideRequest(int west, int south, int east, int north, IClientAPI remote_client) 1146 public void ClientOnParcelDivideRequest(int west, int south, int east, int north, IClientAPI remote_client)
@@ -1428,5 +1552,319 @@ namespace OpenSim.Region.CoreModules.World.Land
1428 1552
1429 UpdateLandObject(localID, land.LandData); 1553 UpdateLandObject(localID, land.LandData);
1430 } 1554 }
1555 public void ClientOnParcelGodMark(IClientAPI client, UUID god, int landID)
1556 {
1557 ILandObject land = null;
1558 List<ILandObject> Land = ((Scene)client.Scene).LandChannel.AllParcels();
1559 foreach (ILandObject landObject in Land)
1560 {
1561 if (landObject.LandData.LocalID == landID)
1562 {
1563 land = landObject;
1564 }
1565 }
1566 land.DeedToGroup(DefaultGodParcelGroup);
1567 land.LandData.Name = DefaultGodParcelName;
1568 land.SendLandUpdateToAvatarsOverMe();
1569 }
1570 private void ClientOnSimWideDeletes(IClientAPI client, UUID agentID, int flags, UUID targetID)
1571 {
1572 ScenePresence SP;
1573 ((Scene)client.Scene).TryGetAvatar(client.AgentId, out SP);
1574 List<SceneObjectGroup> returns = new List<SceneObjectGroup>();
1575 if (SP.GodLevel != 0)
1576 {
1577 if (flags == 0) //All parcels, scripted or not
1578 {
1579 ((Scene)client.Scene).ForEachSOG(delegate(SceneObjectGroup e)
1580 {
1581 if (e.OwnerID == targetID)
1582 {
1583 returns.Add(e);
1584 }
1585 }
1586 );
1587 }
1588 if (flags == 4) //All parcels, scripted object
1589 {
1590 ((Scene)client.Scene).ForEachSOG(delegate(SceneObjectGroup e)
1591 {
1592 if (e.OwnerID == targetID)
1593 {
1594 if (e.scriptScore >= 0.01)
1595 {
1596 returns.Add(e);
1597 }
1598 }
1599 }
1600 );
1601 }
1602 if (flags == 4) //not target parcel, scripted object
1603 {
1604 ((Scene)client.Scene).ForEachSOG(delegate(SceneObjectGroup e)
1605 {
1606 if (e.OwnerID == targetID)
1607 {
1608 ILandObject landobject = ((Scene)client.Scene).LandChannel.GetLandObject(e.AbsolutePosition.X, e.AbsolutePosition.Y);
1609 if (landobject.LandData.OwnerID != e.OwnerID)
1610 {
1611 if (e.scriptScore >= 0.01)
1612 {
1613 returns.Add(e);
1614 }
1615 }
1616 }
1617 }
1618 );
1619 }
1620 foreach (SceneObjectGroup ol in returns)
1621 {
1622 ReturnObject(ol, client);
1623 }
1624 }
1625 }
1626 public void ReturnObject(SceneObjectGroup obj, IClientAPI client)
1627 {
1628 SceneObjectGroup[] objs = new SceneObjectGroup[1];
1629 objs[0] = obj;
1630 ((Scene)client.Scene).returnObjects(objs, client.AgentId);
1631 }
1632
1633 Dictionary<UUID, System.Threading.Timer> Timers = new Dictionary<UUID, System.Threading.Timer>();
1634
1635 public void ClientOnParcelFreezeUser(IClientAPI client, UUID parcelowner, uint flags, UUID target)
1636 {
1637 ScenePresence targetAvatar = null;
1638 ((Scene)client.Scene).TryGetAvatar(target, out targetAvatar);
1639 ScenePresence parcelManager = null;
1640 ((Scene)client.Scene).TryGetAvatar(client.AgentId, out parcelManager);
1641 System.Threading.Timer Timer;
1642
1643 if (targetAvatar.GodLevel == 0)
1644 {
1645 ILandObject land = ((Scene)client.Scene).LandChannel.GetLandObject(targetAvatar.AbsolutePosition.X, targetAvatar.AbsolutePosition.Y);
1646 if (!((Scene)client.Scene).Permissions.CanEditParcel(client.AgentId, land))
1647 return;
1648 if (flags == 0)
1649 {
1650 targetAvatar.AllowMovement = false;
1651 targetAvatar.ControllingClient.SendAlertMessage(parcelManager.Firstname + " " + parcelManager.Lastname + " has frozen you for 30 seconds. You cannot move or interact with the world.");
1652 parcelManager.ControllingClient.SendAlertMessage("Avatar Frozen.");
1653 System.Threading.TimerCallback timeCB = new System.Threading.TimerCallback(OnEndParcelFrozen);
1654 Timer = new System.Threading.Timer(timeCB, targetAvatar, 30000, 0);
1655 Timers.Add(targetAvatar.UUID, Timer);
1656 }
1657 else
1658 {
1659 targetAvatar.AllowMovement = true;
1660 targetAvatar.ControllingClient.SendAlertMessage(parcelManager.Firstname + " " + parcelManager.Lastname + " has unfrozen you.");
1661 parcelManager.ControllingClient.SendAlertMessage("Avatar Unfrozen.");
1662 Timers.TryGetValue(targetAvatar.UUID, out Timer);
1663 Timers.Remove(targetAvatar.UUID);
1664 Timer.Dispose();
1665 }
1666 }
1667 }
1668 private void OnEndParcelFrozen(object avatar)
1669 {
1670 ScenePresence targetAvatar = (ScenePresence)avatar;
1671 targetAvatar.AllowMovement = true;
1672 System.Threading.Timer Timer;
1673 Timers.TryGetValue(targetAvatar.UUID, out Timer);
1674 Timers.Remove(targetAvatar.UUID);
1675 targetAvatar.ControllingClient.SendAgentAlertMessage("The freeze has worn off; you may go about your business.", false);
1676 }
1677
1678
1679 public void ClientOnParcelEjectUser(IClientAPI client, UUID parcelowner, uint flags, UUID target)
1680 {
1681 ScenePresence targetAvatar = null;
1682 ((Scene)client.Scene).TryGetAvatar(target, out targetAvatar);
1683 ScenePresence parcelManager = null;
1684 ((Scene)client.Scene).TryGetAvatar(client.AgentId, out parcelManager);
1685 //Just eject
1686 if (flags == 0)
1687 {
1688 if (targetAvatar.GodLevel == 0)
1689 {
1690 ILandObject land = ((Scene)client.Scene).LandChannel.GetLandObject(targetAvatar.AbsolutePosition.X, targetAvatar.AbsolutePosition.Y);
1691 if (!((Scene)client.Scene).Permissions.CanEditParcel(client.AgentId, land))
1692 return;
1693
1694 Vector3 position = new Vector3(0, 0, 0);
1695 List<ILandObject> allParcels = new List<ILandObject>();
1696 allParcels = AllParcels();
1697 if (allParcels.Count != 1)
1698 {
1699 foreach (ILandObject parcel in allParcels)
1700 {
1701 if (parcel.LandData.GlobalID != land.LandData.GlobalID)
1702 {
1703 if (parcel.IsEitherBannedOrRestricted(targetAvatar.UUID) != true)
1704 {
1705 for (int x = 1; x <= Constants.RegionSize; x += 2)
1706 {
1707 for (int y = 1; y <= Constants.RegionSize; y += 2)
1708 {
1709 if (parcel.ContainsPoint(x, y))
1710 {
1711 position = new Vector3(x, y, targetAvatar.AbsolutePosition.Z);
1712 targetAvatar.TeleportWithMomentum(position);
1713 targetAvatar.ControllingClient.SendAlertMessage("You have been ejected by " + parcelManager.Firstname + " " + parcelManager.Lastname);
1714 parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected.");
1715 return;
1716 }
1717 }
1718 }
1719 }
1720 }
1721 }
1722 }
1723 Vector3 targetVector;
1724 if (targetAvatar.AbsolutePosition.X > targetAvatar.AbsolutePosition.Y)
1725 {
1726 if (targetAvatar.AbsolutePosition.X > .5 * Constants.RegionSize)
1727 {
1728 targetVector = new Vector3(Constants.RegionSize, targetAvatar.AbsolutePosition.Y, targetAvatar.AbsolutePosition.Z); ;
1729 targetAvatar.TeleportWithMomentum(targetVector);
1730 targetAvatar.ControllingClient.SendAlertMessage("You have been ejected by " + parcelManager.Firstname + " " + parcelManager.Lastname);
1731 parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected.");
1732 return;
1733 }
1734 else
1735 {
1736 targetVector = new Vector3(0, targetAvatar.AbsolutePosition.Y, targetAvatar.AbsolutePosition.Z); ;
1737 targetAvatar.TeleportWithMomentum(targetVector);
1738 targetAvatar.ControllingClient.SendAlertMessage("You have been ejected by " + parcelManager.Firstname + " " + parcelManager.Lastname);
1739 parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected.");
1740 return;
1741 }
1742 }
1743 else
1744 {
1745 if (targetAvatar.AbsolutePosition.Y > .5 * Constants.RegionSize)
1746 {
1747 targetVector = new Vector3(targetAvatar.AbsolutePosition.X, Constants.RegionSize, targetAvatar.AbsolutePosition.Z); ;
1748 targetAvatar.TeleportWithMomentum(targetVector);
1749 targetAvatar.ControllingClient.SendAlertMessage("You have been ejected by " + parcelManager.Firstname + " " + parcelManager.Lastname);
1750 parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected.");
1751 return;
1752 }
1753 else
1754 {
1755 targetVector = new Vector3(targetAvatar.AbsolutePosition.X, 0, targetAvatar.AbsolutePosition.Z); ;
1756 targetAvatar.TeleportWithMomentum(targetVector);
1757 targetAvatar.ControllingClient.SendAlertMessage("You have been ejected by " + parcelManager.Firstname + " " + parcelManager.Lastname);
1758 parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected.");
1759 return;
1760 }
1761 }
1762 }
1763 }
1764 //Eject and ban
1765 if (flags == 1)
1766 {
1767 if (targetAvatar.GodLevel == 0)
1768 {
1769 ILandObject land = ((Scene)client.Scene).LandChannel.GetLandObject(targetAvatar.AbsolutePosition.X, targetAvatar.AbsolutePosition.Y);
1770 if (!((Scene)client.Scene).Permissions.CanEditParcel(client.AgentId, land))
1771 return;
1772
1773 Vector3 position = new Vector3(0, 0, 0);
1774 List<ILandObject> allParcels = new List<ILandObject>();
1775 allParcels = AllParcels();
1776 if (allParcels.Count != 1)
1777 {
1778 foreach (ILandObject parcel in allParcels)
1779 {
1780 if (parcel.LandData.GlobalID != land.LandData.GlobalID)
1781 {
1782 if (parcel.IsEitherBannedOrRestricted(targetAvatar.UUID) != true)
1783 {
1784 for (int x = 1; x <= Constants.RegionSize; x += 2)
1785 {
1786 for (int y = 1; y <= Constants.RegionSize; y += 2)
1787 {
1788 if (parcel.ContainsPoint(x, y))
1789 {
1790 position = new Vector3(x, y, targetAvatar.AbsolutePosition.Z);
1791 targetAvatar.TeleportWithMomentum(position);
1792 targetAvatar.ControllingClient.SendAlertMessage("You have been ejected and banned by " + parcelManager.Firstname + " " + parcelManager.Lastname);
1793 parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected and Banned.");
1794 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
1795 entry.AgentID = targetAvatar.UUID;
1796 entry.Flags = AccessList.Ban;
1797 entry.Time = new DateTime();
1798 land.LandData.ParcelAccessList.Add(entry);
1799 return;
1800 }
1801 }
1802 }
1803 }
1804 }
1805 }
1806 }
1807 Vector3 targetVector;
1808 if (targetAvatar.AbsolutePosition.X > targetAvatar.AbsolutePosition.Y)
1809 {
1810 if (targetAvatar.AbsolutePosition.X > .5 * Constants.RegionSize)
1811 {
1812 targetVector = new Vector3(Constants.RegionSize, targetAvatar.AbsolutePosition.Y, targetAvatar.AbsolutePosition.Z); ;
1813 targetAvatar.TeleportWithMomentum(targetVector);
1814 targetAvatar.ControllingClient.SendAlertMessage("You have been ejected and banned by " + parcelManager.Firstname + " " + parcelManager.Lastname);
1815 parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected and Banned.");
1816 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
1817 entry.AgentID = targetAvatar.UUID;
1818 entry.Flags = AccessList.Ban;
1819 entry.Time = new DateTime();
1820 land.LandData.ParcelAccessList.Add(entry);
1821 return;
1822 }
1823 else
1824 {
1825 targetVector = new Vector3(0, targetAvatar.AbsolutePosition.Y, targetAvatar.AbsolutePosition.Z); ;
1826 targetAvatar.TeleportWithMomentum(targetVector);
1827 targetAvatar.ControllingClient.SendAlertMessage("You have been ejected and banned by " + parcelManager.Firstname + " " + parcelManager.Lastname);
1828 parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected and Banned.");
1829 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
1830 entry.AgentID = targetAvatar.UUID;
1831 entry.Flags = AccessList.Ban;
1832 entry.Time = new DateTime();
1833 land.LandData.ParcelAccessList.Add(entry);
1834 return;
1835 }
1836 }
1837 else
1838 {
1839 if (targetAvatar.AbsolutePosition.Y > .5 * Constants.RegionSize)
1840 {
1841 targetVector = new Vector3(targetAvatar.AbsolutePosition.X, Constants.RegionSize, targetAvatar.AbsolutePosition.Z); ;
1842 targetAvatar.TeleportWithMomentum(targetVector);
1843 targetAvatar.ControllingClient.SendAlertMessage("You have been ejected and banned by " + parcelManager.Firstname + " " + parcelManager.Lastname);
1844 parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected and Banned.");
1845 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
1846 entry.AgentID = targetAvatar.UUID;
1847 entry.Flags = AccessList.Ban;
1848 entry.Time = new DateTime();
1849 land.LandData.ParcelAccessList.Add(entry);
1850 return;
1851 }
1852 else
1853 {
1854 targetVector = new Vector3(targetAvatar.AbsolutePosition.X, 0, targetAvatar.AbsolutePosition.Z); ;
1855 targetAvatar.TeleportWithMomentum(targetVector);
1856 targetAvatar.ControllingClient.SendAlertMessage("You have been ejected and banned by " + parcelManager.Firstname + " " + parcelManager.Lastname);
1857 parcelManager.ControllingClient.SendAlertMessage("Avatar Ejected and Banned.");
1858 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
1859 entry.AgentID = targetAvatar.UUID;
1860 entry.Flags = AccessList.Ban;
1861 entry.Time = new DateTime();
1862 land.LandData.ParcelAccessList.Add(entry);
1863 return;
1864 }
1865 }
1866 }
1867 }
1868 }
1431 } 1869 }
1432} 1870}
diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
index 1fa8630..1c65965 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs
@@ -267,11 +267,7 @@ namespace OpenSim.Region.CoreModules.World.Land
267 267
268 public bool IsEitherBannedOrRestricted(UUID avatar) 268 public bool IsEitherBannedOrRestricted(UUID avatar)
269 { 269 {
270 if (IsBannedFromLand(avatar)) 270 if (IsRestrictedFromLand(avatar) || IsBannedFromLand(avatar))
271 {
272 return true;
273 }
274 else if (IsRestrictedFromLand(avatar))
275 { 271 {
276 return true; 272 return true;
277 } 273 }
@@ -280,7 +276,8 @@ namespace OpenSim.Region.CoreModules.World.Land
280 276
281 public bool IsBannedFromLand(UUID avatar) 277 public bool IsBannedFromLand(UUID avatar)
282 { 278 {
283 if ((LandData.Flags & (uint) ParcelFlags.UseBanList) > 0) 279 ScenePresence SP = m_scene.GetScenePresence(avatar);
280 if ((LandData.Flags & (uint)ParcelFlags.UseBanList) > 0)
284 { 281 {
285 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); 282 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
286 entry.AgentID = avatar; 283 entry.AgentID = avatar;
@@ -288,8 +285,22 @@ namespace OpenSim.Region.CoreModules.World.Land
288 entry.Time = new DateTime(); 285 entry.Time = new DateTime();
289 if (LandData.ParcelAccessList.Contains(entry)) 286 if (LandData.ParcelAccessList.Contains(entry))
290 { 287 {
291 //They are banned, so lets send them a notice about this parcel 288 if ((LandData.Flags & (uint)ParcelFlags.UseAccessGroup) > 0)
292 return true; 289 {
290 if (LandData.GroupID == SP.ControllingClient.ActiveGroupId)
291 {
292 return false;
293 }
294 else
295 {
296 //They are not allowed in this parcel, but not banned, so lets send them a notice about this parcel
297 return true;
298 }
299 }
300 else
301 {
302 return true;
303 }
293 } 304 }
294 } 305 }
295 return false; 306 return false;
@@ -297,7 +308,8 @@ namespace OpenSim.Region.CoreModules.World.Land
297 308
298 public bool IsRestrictedFromLand(UUID avatar) 309 public bool IsRestrictedFromLand(UUID avatar)
299 { 310 {
300 if ((LandData.Flags & (uint) ParcelFlags.UseAccessList) > 0) 311 ScenePresence SP = m_scene.GetScenePresence(avatar);
312 if ((LandData.Flags & (uint)ParcelFlags.UseAccessList) > 0)
301 { 313 {
302 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry(); 314 ParcelManager.ParcelAccessEntry entry = new ParcelManager.ParcelAccessEntry();
303 entry.AgentID = avatar; 315 entry.AgentID = avatar;
@@ -305,8 +317,22 @@ namespace OpenSim.Region.CoreModules.World.Land
305 entry.Time = new DateTime(); 317 entry.Time = new DateTime();
306 if (!LandData.ParcelAccessList.Contains(entry)) 318 if (!LandData.ParcelAccessList.Contains(entry))
307 { 319 {
308 //They are not allowed in this parcel, but not banned, so lets send them a notice about this parcel 320 if ((LandData.Flags & (uint)ParcelFlags.UseAccessGroup) > 0)
309 return true; 321 {
322 if (LandData.GroupID == SP.ControllingClient.ActiveGroupId)
323 {
324 return false;
325 }
326 else
327 {
328 //They are not allowed in this parcel, but not banned, so lets send them a notice about this parcel
329 return true;
330 }
331 }
332 else
333 {
334 return true;
335 }
310 } 336 }
311 } 337 }
312 return false; 338 return false;
diff --git a/OpenSim/Region/CoreModules/World/Meta7Windlight/Meta7WindlightModule.cs b/OpenSim/Region/CoreModules/World/Meta7Windlight/Meta7WindlightModule.cs
new file mode 100644
index 0000000..72b0b38
--- /dev/null
+++ b/OpenSim/Region/CoreModules/World/Meta7Windlight/Meta7WindlightModule.cs
@@ -0,0 +1,274 @@
1/*
2 * Copyright (c) Thomas Grimshaw and Magne Metaverse Research
3 *
4 * This module is not open source. All rights reserved.
5 * Unauthorised copying, distribution or public display is prohibited.
6 *
7 */
8
9using System;
10using System.Collections.Generic;
11using System.IO;
12using System.Reflection;
13using OpenMetaverse;
14using log4net;
15using Nini.Config;
16using OpenSim.Data;
17using OpenSim.Framework;
18using OpenSim.Region.CoreModules.Framework.InterfaceCommander;
19using OpenSim.Region.Framework.Interfaces;
20using OpenSim.Region.Framework.Scenes;
21
22
23namespace OpenSim.Region.CoreModules.World.Meta7Windlight
24{
25 public class Meta7WindlightModule : IRegionModule, ICommandableModule
26 {
27 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
28 private readonly Commander m_commander = new Commander("windlight");
29 private Scene m_scene;
30 private static bool m_enableWindlight;
31
32 #region ICommandableModule Members
33
34 public ICommander CommandInterface
35 {
36 get { return m_commander; }
37 }
38
39 #endregion
40
41 #region IRegionModule Members
42
43 public static bool EnableWindlight
44 {
45 get
46 {
47 return m_enableWindlight;
48 }
49 set
50 {
51 }
52 }
53
54 public void Initialise(Scene scene, IConfigSource config)
55 {
56 m_scene = scene;
57 m_scene.RegisterModuleInterface<IRegionModule>(this);
58 m_scene.EventManager.OnPluginConsole += EventManager_OnPluginConsole;
59
60 // ini file settings
61 try
62 {
63 m_enableWindlight = config.Configs["Meta7Windlight"].GetBoolean("enable_windlight", false);
64 }
65 catch (Exception)
66 {
67 m_log.Debug("[WINDLIGHT]: ini failure for enable_windlight - using default");
68 }
69
70 if (m_enableWindlight)
71 {
72 m_scene.EventManager.OnMakeRootAgent += EventManager_OnMakeRootAgent;
73 m_scene.EventManager.OnSaveNewWindlightProfile += EventManager_OnSaveNewWindlightProfile;
74 m_scene.EventManager.OnSendNewWindlightProfileTargeted += EventManager_OnSendNewWindlightProfileTargeted;
75 }
76
77 InstallCommands();
78
79 m_log.Debug("[WINDLIGHT]: Initialised windlight module");
80 }
81
82 private List<byte[]> compileWindlightSettings(RegionMeta7WindlightData wl)
83 {
84 byte[] mBlock = new Byte[249];
85 int pos = 0;
86
87 wl.waterColor.ToBytes(mBlock, 0); pos += 12;
88 Utils.FloatToBytes(wl.waterFogDensityExponent).CopyTo(mBlock, pos); pos += 4;
89 Utils.FloatToBytes(wl.underwaterFogModifier).CopyTo(mBlock, pos); pos += 4;
90 wl.reflectionWaveletScale.ToBytes(mBlock, pos); pos += 12;
91 Utils.FloatToBytes(wl.fresnelScale).CopyTo(mBlock, pos); pos += 4;
92 Utils.FloatToBytes(wl.fresnelOffset).CopyTo(mBlock, pos); pos += 4;
93 Utils.FloatToBytes(wl.refractScaleAbove).CopyTo(mBlock, pos); pos += 4;
94 Utils.FloatToBytes(wl.refractScaleBelow).CopyTo(mBlock, pos); pos += 4;
95 Utils.FloatToBytes(wl.blurMultiplier).CopyTo(mBlock, pos); pos += 4;
96 wl.bigWaveDirection.ToBytes(mBlock, pos); pos += 8;
97 wl.littleWaveDirection.ToBytes(mBlock, pos); pos += 8;
98 wl.normalMapTexture.ToBytes(mBlock, pos); pos += 16;
99 wl.horizon.ToBytes(mBlock, pos); pos += 16;
100 Utils.FloatToBytes(wl.hazeHorizon).CopyTo(mBlock, pos); pos += 4;
101 wl.blueDensity.ToBytes(mBlock, pos); pos += 16;
102 Utils.FloatToBytes(wl.hazeDensity).CopyTo(mBlock, pos); pos += 4;
103 Utils.FloatToBytes(wl.densityMultiplier).CopyTo(mBlock, pos); pos += 4;
104 Utils.FloatToBytes(wl.distanceMultiplier).CopyTo(mBlock, pos); pos += 4;
105 wl.sunMoonColor.ToBytes(mBlock, pos); pos += 16;
106 Utils.FloatToBytes(wl.sunMoonPosition).CopyTo(mBlock, pos); pos += 4;
107 wl.ambient.ToBytes(mBlock, pos); pos += 16;
108 Utils.FloatToBytes(wl.eastAngle).CopyTo(mBlock, pos); pos += 4;
109 Utils.FloatToBytes(wl.sunGlowFocus).CopyTo(mBlock, pos); pos += 4;
110 Utils.FloatToBytes(wl.sunGlowSize).CopyTo(mBlock, pos); pos += 4;
111 Utils.FloatToBytes(wl.sceneGamma).CopyTo(mBlock, pos); pos += 4;
112 Utils.FloatToBytes(wl.starBrightness).CopyTo(mBlock, pos); pos += 4;
113 wl.cloudColor.ToBytes(mBlock, pos); pos += 16;
114 wl.cloudXYDensity.ToBytes(mBlock, pos); pos += 12;
115 Utils.FloatToBytes(wl.cloudCoverage).CopyTo(mBlock, pos); pos += 4;
116 Utils.FloatToBytes(wl.cloudScale).CopyTo(mBlock, pos); pos += 4;
117 wl.cloudDetailXYDensity.ToBytes(mBlock, pos); pos += 12;
118 Utils.FloatToBytes(wl.cloudScrollX).CopyTo(mBlock, pos); pos += 4;
119 Utils.FloatToBytes(wl.cloudScrollY).CopyTo(mBlock, pos); pos += 4;
120 Utils.UInt16ToBytes(wl.maxAltitude).CopyTo(mBlock, pos); pos += 2;
121 mBlock[pos] = Convert.ToByte(wl.cloudScrollXLock); pos++;
122 mBlock[pos] = Convert.ToByte(wl.cloudScrollYLock); pos++;
123 mBlock[pos] = Convert.ToByte(wl.drawClassicClouds); pos++;
124 List<byte[]> param = new List<byte[]>();
125 param.Add(mBlock);
126 return param;
127 }
128 public void SendProfileToClient(ScenePresence presence)
129 {
130 IClientAPI client = presence.ControllingClient;
131 if (m_enableWindlight)
132 {
133 if (presence.IsChildAgent == false)
134 {
135 List<byte[]> param = compileWindlightSettings(m_scene.RegionInfo.WindlightSettings);
136 client.SendGenericMessage("Windlight", param);
137 }
138 }
139 else
140 {
141 //We probably don't want to spam chat with this.. probably
142 //m_log.Debug("[WINDLIGHT]: Module disabled");
143 }
144 }
145 public void SendProfileToClient(ScenePresence presence, RegionMeta7WindlightData wl)
146 {
147 IClientAPI client = presence.ControllingClient;
148 if (m_enableWindlight)
149 {
150 if (presence.IsChildAgent == false)
151 {
152 List<byte[]> param = compileWindlightSettings(wl);
153 client.SendGenericMessage("Windlight", param);
154 }
155 }
156 else
157 {
158 //We probably don't want to spam chat with this.. probably
159 //m_log.Debug("[WINDLIGHT]: Module disabled");
160 }
161 }
162 private void EventManager_OnMakeRootAgent(ScenePresence presence)
163 {
164 m_log.Debug("[WINDLIGHT]: Sending windlight scene to new client");
165 SendProfileToClient(presence);
166 }
167 private void EventManager_OnSendNewWindlightProfileTargeted(RegionMeta7WindlightData wl, UUID pUUID)
168 {
169 ScenePresence Sc;
170 if (m_scene.TryGetAvatar(pUUID,out Sc))
171 {
172 SendProfileToClient(Sc,wl);
173 }
174 }
175 private void EventManager_OnSaveNewWindlightProfile()
176 {
177 m_scene.ForEachScenePresence(SendProfileToClient);
178 }
179
180 public void PostInitialise()
181 {
182
183 }
184
185 public void Close()
186 {
187 }
188
189 public string Name
190 {
191 get { return "Meta7WindlightModule"; }
192 }
193
194 public bool IsSharedModule
195 {
196 get { return false; }
197 }
198
199 #endregion
200
201 #region events
202
203 #endregion
204
205 #region ICommandableModule Members
206
207 private void InstallCommands()
208 {
209 Command wlload = new Command("load", CommandIntentions.COMMAND_NON_HAZARDOUS, HandleLoad, "Load windlight profile from the database and broadcast");
210 Command wlenable = new Command("enable", CommandIntentions.COMMAND_NON_HAZARDOUS, HandleEnable, "Enable the windlight plugin");
211 Command wldisable = new Command("disable", CommandIntentions.COMMAND_NON_HAZARDOUS, HandleDisable, "Enable the windlight plugin");
212
213 m_commander.RegisterCommand("load", wlload);
214 m_commander.RegisterCommand("enable", wlenable);
215 m_commander.RegisterCommand("disable", wldisable);
216
217 m_scene.RegisterModuleCommander(m_commander);
218 }
219
220 private void HandleLoad(Object[] args)
221 {
222 if (!m_enableWindlight)
223 {
224 m_log.InfoFormat("[WINDLIGHT]: Cannot load windlight profile, module disabled. Use 'windlight enable' first.");
225 }
226 else
227 {
228 m_log.InfoFormat("[WINDLIGHT]: Loading Windlight profile from database");
229 m_scene.LoadWindlightProfile();
230 m_log.InfoFormat("[WINDLIGHT]: Load complete");
231 }
232 }
233
234 private void HandleDisable(Object[] args)
235 {
236 m_log.InfoFormat("[WINDLIGHT]: Plugin now disabled");
237 m_enableWindlight=false;
238 }
239
240 private void HandleEnable(Object[] args)
241 {
242 m_log.InfoFormat("[WINDLIGHT]: Plugin now enabled");
243 m_enableWindlight = true;
244 }
245
246 /// <summary>
247 /// Processes commandline input. Do not call directly.
248 /// </summary>
249 /// <param name="args">Commandline arguments</param>
250 private void EventManager_OnPluginConsole(string[] args)
251 {
252 if (args[0] == "windlight")
253 {
254 if (args.Length == 1)
255 {
256 m_commander.ProcessConsoleCommand("add", new string[0]);
257 return;
258 }
259
260 string[] tmpArgs = new string[args.Length - 2];
261 int i;
262 for (i = 2; i < args.Length; i++)
263 {
264 tmpArgs[i - 2] = args[i];
265 }
266
267 m_commander.ProcessConsoleCommand(args[1], tmpArgs);
268 }
269 }
270 #endregion
271
272 }
273}
274
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index a1957d1..58e3de9 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -459,7 +459,7 @@ namespace OpenSim.Region.Examples.SimpleModule
459 459
460 } 460 }
461 461
462 public void SendGenericMessage(string method, List<string> message) 462 public void SendGenericMessage(string method, List<byte[]> message)
463 { 463 {
464 464
465 } 465 }
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionDataStore.cs b/OpenSim/Region/Framework/Interfaces/IRegionDataStore.cs
index 78bd622..7312799 100644
--- a/OpenSim/Region/Framework/Interfaces/IRegionDataStore.cs
+++ b/OpenSim/Region/Framework/Interfaces/IRegionDataStore.cs
@@ -103,6 +103,8 @@ namespace OpenSim.Region.Framework.Interfaces
103 103
104 void StoreRegionSettings(RegionSettings rs); 104 void StoreRegionSettings(RegionSettings rs);
105 RegionSettings LoadRegionSettings(UUID regionUUID); 105 RegionSettings LoadRegionSettings(UUID regionUUID);
106 RegionMeta7WindlightData LoadRegionWindlightSettings(UUID regionUUID);
107 void StoreRegionWindlightSettings(RegionMeta7WindlightData wl);
106 108
107 void Shutdown(); 109 void Shutdown();
108 } 110 }
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
index 7307662..fd7d44f 100644
--- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
+++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
@@ -53,8 +53,8 @@ namespace OpenSim.Region.Framework.Scenes.Animation
53 { 53 {
54 get { return m_movementAnimation; } 54 get { return m_movementAnimation; }
55 } 55 }
56 protected string m_movementAnimation = "DEFAULT"; 56 // protected string m_movementAnimation = "DEFAULT"; //KF: 'DEFAULT' does not exist!
57 57 protected string m_movementAnimation = "CROUCH"; //KF: CROUCH ensures reliable Av Anim. init.
58 private int m_animTickFall; 58 private int m_animTickFall;
59 private int m_animTickJump; 59 private int m_animTickJump;
60 60
@@ -123,17 +123,22 @@ namespace OpenSim.Region.Framework.Scenes.Animation
123 /// </summary> 123 /// </summary>
124 public void TrySetMovementAnimation(string anim) 124 public void TrySetMovementAnimation(string anim)
125 { 125 {
126 //m_log.DebugFormat("Updating movement animation to {0}", anim); 126//Console.WriteLine("Updating movement animation to {0}", anim);
127 127
128 if (!m_scenePresence.IsChildAgent) 128 if (!m_scenePresence.IsChildAgent)
129 { 129 {
130 if (m_animations.TrySetDefaultAnimation( 130 if (m_animations.TrySetDefaultAnimation(
131 anim, m_scenePresence.ControllingClient.NextAnimationSequenceNumber, m_scenePresence.UUID)) 131 anim, m_scenePresence.ControllingClient.NextAnimationSequenceNumber, m_scenePresence.UUID))
132 { 132 {
133//Console.WriteLine("TSMA {0} success.", anim);
133 // 16384 is CHANGED_ANIMATION 134 // 16384 is CHANGED_ANIMATION
134 m_scenePresence.SendScriptEventToAttachments("changed", new Object[] { 16384 }); 135 m_scenePresence.SendScriptEventToAttachments("changed", new Object[] { 16384 });
135 SendAnimPack(); 136 SendAnimPack();
136 } 137 }
138 else
139 {
140//Console.WriteLine("TSMA {0} fail.", anim);
141 }
137 } 142 }
138 } 143 }
139 144
@@ -146,10 +151,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
146 const float PREJUMP_DELAY = 0.25f; 151 const float PREJUMP_DELAY = 0.25f;
147 152
148 #region Inputs 153 #region Inputs
149 if (m_scenePresence.SitGround) 154
150 {
151 return "SIT_GROUND_CONSTRAINED";
152 }
153 AgentManager.ControlFlags controlFlags = (AgentManager.ControlFlags)m_scenePresence.AgentControlFlags; 155 AgentManager.ControlFlags controlFlags = (AgentManager.ControlFlags)m_scenePresence.AgentControlFlags;
154 PhysicsActor actor = m_scenePresence.PhysicsActor; 156 PhysicsActor actor = m_scenePresence.PhysicsActor;
155 157
@@ -159,11 +161,10 @@ namespace OpenSim.Region.Framework.Scenes.Animation
159 Vector3 left = Vector3.Transform(Vector3.UnitY, rotMatrix); 161 Vector3 left = Vector3.Transform(Vector3.UnitY, rotMatrix);
160 162
161 // Check control flags 163 // Check control flags
162 bool heldForward = 164 bool heldForward = ((controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_AT_POS) == AgentManager.ControlFlags.AGENT_CONTROL_AT_POS || (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_POS) == AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_POS);
163 (((controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_AT_POS) == AgentManager.ControlFlags.AGENT_CONTROL_AT_POS) || ((controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_POS) == AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_POS)); 165 bool heldBack = ((controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_AT_NEG) == AgentManager.ControlFlags.AGENT_CONTROL_AT_NEG || (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_NEG) == AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_NEG);
164 bool heldBack = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_AT_NEG) == AgentManager.ControlFlags.AGENT_CONTROL_AT_NEG; 166 bool heldLeft = ((controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_LEFT_POS) == AgentManager.ControlFlags.AGENT_CONTROL_LEFT_POS || (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_LEFT_POS) == AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_LEFT_POS);
165 bool heldLeft = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_LEFT_POS) == AgentManager.ControlFlags.AGENT_CONTROL_LEFT_POS; 167 bool heldRight = ((controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_LEFT_NEG) == AgentManager.ControlFlags.AGENT_CONTROL_LEFT_NEG || (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_LEFT_NEG) == AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_LEFT_NEG);
166 bool heldRight = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_LEFT_NEG) == AgentManager.ControlFlags.AGENT_CONTROL_LEFT_NEG;
167 //bool heldTurnLeft = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_TURN_LEFT) == AgentManager.ControlFlags.AGENT_CONTROL_TURN_LEFT; 168 //bool heldTurnLeft = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_TURN_LEFT) == AgentManager.ControlFlags.AGENT_CONTROL_TURN_LEFT;
168 //bool heldTurnRight = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_TURN_RIGHT) == AgentManager.ControlFlags.AGENT_CONTROL_TURN_RIGHT; 169 //bool heldTurnRight = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_TURN_RIGHT) == AgentManager.ControlFlags.AGENT_CONTROL_TURN_RIGHT;
169 bool heldUp = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_UP_POS) == AgentManager.ControlFlags.AGENT_CONTROL_UP_POS; 170 bool heldUp = (controlFlags & AgentManager.ControlFlags.AGENT_CONTROL_UP_POS) == AgentManager.ControlFlags.AGENT_CONTROL_UP_POS;
@@ -316,7 +317,7 @@ namespace OpenSim.Region.Framework.Scenes.Animation
316 public void UpdateMovementAnimations() 317 public void UpdateMovementAnimations()
317 { 318 {
318 m_movementAnimation = GetMovementAnimation(); 319 m_movementAnimation = GetMovementAnimation();
319 320//Console.WriteLine("UMA got {0}", m_movementAnimation);
320 if (m_movementAnimation == "PREJUMP" && !m_scenePresence.Scene.m_usePreJump) 321 if (m_movementAnimation == "PREJUMP" && !m_scenePresence.Scene.m_usePreJump)
321 { 322 {
322 // This was the previous behavior before PREJUMP 323 // This was the previous behavior before PREJUMP
@@ -451,4 +452,4 @@ namespace OpenSim.Region.Framework.Scenes.Animation
451 m_scenePresence = null; 452 m_scenePresence = null;
452 } 453 }
453 } 454 }
454} \ No newline at end of file 455}
diff --git a/OpenSim/Region/Framework/Scenes/EntityManager.cs b/OpenSim/Region/Framework/Scenes/EntityManager.cs
index 099fcce..c246e32 100644
--- a/OpenSim/Region/Framework/Scenes/EntityManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EntityManager.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Region.Framework.Scenes
40 private readonly Dictionary<UUID,EntityBase> m_eb_uuid = new Dictionary<UUID, EntityBase>(); 40 private readonly Dictionary<UUID,EntityBase> m_eb_uuid = new Dictionary<UUID, EntityBase>();
41 private readonly Dictionary<uint, EntityBase> m_eb_localID = new Dictionary<uint, EntityBase>(); 41 private readonly Dictionary<uint, EntityBase> m_eb_localID = new Dictionary<uint, EntityBase>();
42 //private readonly Dictionary<UUID, ScenePresence> m_pres_uuid = new Dictionary<UUID, ScenePresence>(); 42 //private readonly Dictionary<UUID, ScenePresence> m_pres_uuid = new Dictionary<UUID, ScenePresence>();
43 private readonly Object m_lock = new Object(); 43 private System.Threading.ReaderWriterLockSlim m_lock = new System.Threading.ReaderWriterLockSlim();
44 44
45 [Obsolete("Use Add() instead.")] 45 [Obsolete("Use Add() instead.")]
46 public void Add(UUID id, EntityBase eb) 46 public void Add(UUID id, EntityBase eb)
@@ -50,7 +50,8 @@ namespace OpenSim.Region.Framework.Scenes
50 50
51 public void Add(EntityBase entity) 51 public void Add(EntityBase entity)
52 { 52 {
53 lock (m_lock) 53 m_lock.EnterWriteLock();
54 try
54 { 55 {
55 try 56 try
56 { 57 {
@@ -62,11 +63,16 @@ namespace OpenSim.Region.Framework.Scenes
62 m_log.ErrorFormat("Add Entity failed: {0}", e.Message); 63 m_log.ErrorFormat("Add Entity failed: {0}", e.Message);
63 } 64 }
64 } 65 }
66 finally
67 {
68 m_lock.ExitWriteLock();
69 }
65 } 70 }
66 71
67 public void InsertOrReplace(EntityBase entity) 72 public void InsertOrReplace(EntityBase entity)
68 { 73 {
69 lock (m_lock) 74 m_lock.EnterWriteLock();
75 try
70 { 76 {
71 try 77 try
72 { 78 {
@@ -78,15 +84,24 @@ namespace OpenSim.Region.Framework.Scenes
78 m_log.ErrorFormat("Insert or Replace Entity failed: {0}", e.Message); 84 m_log.ErrorFormat("Insert or Replace Entity failed: {0}", e.Message);
79 } 85 }
80 } 86 }
87 finally
88 {
89 m_lock.ExitWriteLock();
90 }
81 } 91 }
82 92
83 public void Clear() 93 public void Clear()
84 { 94 {
85 lock (m_lock) 95 m_lock.EnterWriteLock();
96 try
86 { 97 {
87 m_eb_uuid.Clear(); 98 m_eb_uuid.Clear();
88 m_eb_localID.Clear(); 99 m_eb_localID.Clear();
89 } 100 }
101 finally
102 {
103 m_lock.ExitWriteLock();
104 }
90 } 105 }
91 106
92 public int Count 107 public int Count
@@ -123,7 +138,8 @@ namespace OpenSim.Region.Framework.Scenes
123 138
124 public bool Remove(uint localID) 139 public bool Remove(uint localID)
125 { 140 {
126 lock (m_lock) 141 m_lock.EnterWriteLock();
142 try
127 { 143 {
128 try 144 try
129 { 145 {
@@ -141,11 +157,16 @@ namespace OpenSim.Region.Framework.Scenes
141 return false; 157 return false;
142 } 158 }
143 } 159 }
160 finally
161 {
162 m_lock.ExitWriteLock();
163 }
144 } 164 }
145 165
146 public bool Remove(UUID id) 166 public bool Remove(UUID id)
147 { 167 {
148 lock (m_lock) 168 m_lock.EnterWriteLock();
169 try
149 { 170 {
150 try 171 try
151 { 172 {
@@ -163,13 +184,18 @@ namespace OpenSim.Region.Framework.Scenes
163 return false; 184 return false;
164 } 185 }
165 } 186 }
187 finally
188 {
189 m_lock.ExitWriteLock();
190 }
166 } 191 }
167 192
168 public List<EntityBase> GetAllByType<T>() 193 public List<EntityBase> GetAllByType<T>()
169 { 194 {
170 List<EntityBase> tmp = new List<EntityBase>(); 195 List<EntityBase> tmp = new List<EntityBase>();
171 196
172 lock (m_lock) 197 m_lock.EnterReadLock();
198 try
173 { 199 {
174 try 200 try
175 { 201 {
@@ -187,23 +213,33 @@ namespace OpenSim.Region.Framework.Scenes
187 tmp = null; 213 tmp = null;
188 } 214 }
189 } 215 }
216 finally
217 {
218 m_lock.ExitReadLock();
219 }
190 220
191 return tmp; 221 return tmp;
192 } 222 }
193 223
194 public List<EntityBase> GetEntities() 224 public List<EntityBase> GetEntities()
195 { 225 {
196 lock (m_lock) 226 m_lock.EnterReadLock();
227 try
197 { 228 {
198 return new List<EntityBase>(m_eb_uuid.Values); 229 return new List<EntityBase>(m_eb_uuid.Values);
199 } 230 }
231 finally
232 {
233 m_lock.ExitReadLock();
234 }
200 } 235 }
201 236
202 public EntityBase this[UUID id] 237 public EntityBase this[UUID id]
203 { 238 {
204 get 239 get
205 { 240 {
206 lock (m_lock) 241 m_lock.EnterReadLock();
242 try
207 { 243 {
208 EntityBase entity; 244 EntityBase entity;
209 if (m_eb_uuid.TryGetValue(id, out entity)) 245 if (m_eb_uuid.TryGetValue(id, out entity))
@@ -211,6 +247,10 @@ namespace OpenSim.Region.Framework.Scenes
211 else 247 else
212 return null; 248 return null;
213 } 249 }
250 finally
251 {
252 m_lock.ExitReadLock();
253 }
214 } 254 }
215 set 255 set
216 { 256 {
@@ -222,7 +262,8 @@ namespace OpenSim.Region.Framework.Scenes
222 { 262 {
223 get 263 get
224 { 264 {
225 lock (m_lock) 265 m_lock.EnterReadLock();
266 try
226 { 267 {
227 EntityBase entity; 268 EntityBase entity;
228 if (m_eb_localID.TryGetValue(localID, out entity)) 269 if (m_eb_localID.TryGetValue(localID, out entity))
@@ -230,6 +271,10 @@ namespace OpenSim.Region.Framework.Scenes
230 else 271 else
231 return null; 272 return null;
232 } 273 }
274 finally
275 {
276 m_lock.ExitReadLock();
277 }
233 } 278 }
234 set 279 set
235 { 280 {
@@ -239,18 +284,28 @@ namespace OpenSim.Region.Framework.Scenes
239 284
240 public bool TryGetValue(UUID key, out EntityBase obj) 285 public bool TryGetValue(UUID key, out EntityBase obj)
241 { 286 {
242 lock (m_lock) 287 m_lock.EnterReadLock();
288 try
243 { 289 {
244 return m_eb_uuid.TryGetValue(key, out obj); 290 return m_eb_uuid.TryGetValue(key, out obj);
245 } 291 }
292 finally
293 {
294 m_lock.ExitReadLock();
295 }
246 } 296 }
247 297
248 public bool TryGetValue(uint key, out EntityBase obj) 298 public bool TryGetValue(uint key, out EntityBase obj)
249 { 299 {
250 lock (m_lock) 300 m_lock.EnterReadLock();
301 try
251 { 302 {
252 return m_eb_localID.TryGetValue(key, out obj); 303 return m_eb_localID.TryGetValue(key, out obj);
253 } 304 }
305 finally
306 {
307 m_lock.ExitReadLock();
308 }
254 } 309 }
255 310
256 /// <summary> 311 /// <summary>
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index ac04462..3cce53d 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -206,7 +206,11 @@ namespace OpenSim.Region.Framework.Scenes
206 public event OnMakeChildAgentDelegate OnMakeChildAgent; 206 public event OnMakeChildAgentDelegate OnMakeChildAgent;
207 207
208 public delegate void OnMakeRootAgentDelegate(ScenePresence presence); 208 public delegate void OnMakeRootAgentDelegate(ScenePresence presence);
209 public delegate void OnSaveNewWindlightProfileDelegate();
210 public delegate void OnSendNewWindlightProfileTargetedDelegate(RegionMeta7WindlightData wl, UUID user);
209 public event OnMakeRootAgentDelegate OnMakeRootAgent; 211 public event OnMakeRootAgentDelegate OnMakeRootAgent;
212 public event OnSendNewWindlightProfileTargetedDelegate OnSendNewWindlightProfileTargeted;
213 public event OnSaveNewWindlightProfileDelegate OnSaveNewWindlightProfile;
210 214
211 /// <summary> 215 /// <summary>
212 /// Triggered when an object or attachment enters a scene 216 /// Triggered when an object or attachment enters a scene
@@ -1216,6 +1220,24 @@ namespace OpenSim.Region.Framework.Scenes
1216 } 1220 }
1217 } 1221 }
1218 1222
1223 public void TriggerOnSendNewWindlightProfileTargeted(RegionMeta7WindlightData wl, UUID user)
1224 {
1225 OnSendNewWindlightProfileTargetedDelegate handlerSendNewWindlightProfileTargeted = OnSendNewWindlightProfileTargeted;
1226 if (handlerSendNewWindlightProfileTargeted != null)
1227 {
1228 handlerSendNewWindlightProfileTargeted(wl, user);
1229 }
1230 }
1231
1232 public void TriggerOnSaveNewWindlightProfile()
1233 {
1234 OnSaveNewWindlightProfileDelegate handlerSaveNewWindlightProfile = OnSaveNewWindlightProfile;
1235 if (handlerSaveNewWindlightProfile != null)
1236 {
1237 handlerSaveNewWindlightProfile();
1238 }
1239 }
1240
1219 public void TriggerOnMakeRootAgent(ScenePresence presence) 1241 public void TriggerOnMakeRootAgent(ScenePresence presence)
1220 { 1242 {
1221 OnMakeRootAgentDelegate handlerMakeRootAgent = OnMakeRootAgent; 1243 OnMakeRootAgentDelegate handlerMakeRootAgent = OnMakeRootAgent;
@@ -1992,4 +2014,4 @@ namespace OpenSim.Region.Framework.Scenes
1992 } 2014 }
1993 } 2015 }
1994 } 2016 }
1995} \ No newline at end of file 2017}
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 6df25d6..e458ecf 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -782,8 +782,12 @@ namespace OpenSim.Region.Framework.Scenes
782 public void RemoveTaskInventory(IClientAPI remoteClient, UUID itemID, uint localID) 782 public void RemoveTaskInventory(IClientAPI remoteClient, UUID itemID, uint localID)
783 { 783 {
784 SceneObjectPart part = GetSceneObjectPart(localID); 784 SceneObjectPart part = GetSceneObjectPart(localID);
785 SceneObjectGroup group = part.ParentGroup; 785 SceneObjectGroup group = null;
786 if (group != null) 786 if (part != null)
787 {
788 group = part.ParentGroup;
789 }
790 if (part != null && group != null)
787 { 791 {
788 TaskInventoryItem item = group.GetInventoryItem(localID, itemID); 792 TaskInventoryItem item = group.GetInventoryItem(localID, itemID);
789 if (item == null) 793 if (item == null)
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 5e5a52e..181b7c5 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -601,6 +601,8 @@ namespace OpenSim.Region.Framework.Scenes
601 601
602 // Load region settings 602 // Load region settings
603 m_regInfo.RegionSettings = m_storageManager.DataStore.LoadRegionSettings(m_regInfo.RegionID); 603 m_regInfo.RegionSettings = m_storageManager.DataStore.LoadRegionSettings(m_regInfo.RegionID);
604 m_regInfo.WindlightSettings = m_storageManager.DataStore.LoadRegionWindlightSettings(m_regInfo.RegionID);
605
604 if (m_storageManager.EstateDataStore != null) 606 if (m_storageManager.EstateDataStore != null)
605 { 607 {
606 m_regInfo.EstateSettings = m_storageManager.EstateDataStore.LoadEstateSettings(m_regInfo.RegionID); 608 m_regInfo.EstateSettings = m_storageManager.EstateDataStore.LoadEstateSettings(m_regInfo.RegionID);
@@ -979,6 +981,15 @@ namespace OpenSim.Region.Framework.Scenes
979 /// <param name="seconds">float indicating duration before restart.</param> 981 /// <param name="seconds">float indicating duration before restart.</param>
980 public virtual void Restart(float seconds) 982 public virtual void Restart(float seconds)
981 { 983 {
984 Restart(seconds, true);
985 }
986
987 /// <summary>
988 /// Given float seconds, this will restart the region. showDialog will optionally alert the users.
989 /// </summary>
990 /// <param name="seconds">float indicating duration before restart.</param>
991 public virtual void Restart(float seconds, bool showDialog)
992 {
982 // notifications are done in 15 second increments 993 // notifications are done in 15 second increments
983 // so .. if the number of seconds is less then 15 seconds, it's not really a restart request 994 // so .. if the number of seconds is less then 15 seconds, it's not really a restart request
984 // It's a 'Cancel restart' request. 995 // It's a 'Cancel restart' request.
@@ -999,8 +1010,11 @@ namespace OpenSim.Region.Framework.Scenes
999 m_restartTimer.Elapsed += new ElapsedEventHandler(RestartTimer_Elapsed); 1010 m_restartTimer.Elapsed += new ElapsedEventHandler(RestartTimer_Elapsed);
1000 m_log.Info("[REGION]: Restarting Region in " + (seconds / 60) + " minutes"); 1011 m_log.Info("[REGION]: Restarting Region in " + (seconds / 60) + " minutes");
1001 m_restartTimer.Start(); 1012 m_restartTimer.Start();
1002 m_dialogModule.SendNotificationToUsersInRegion( 1013 if (showDialog)
1014 {
1015 m_dialogModule.SendNotificationToUsersInRegion(
1003 UUID.Random(), String.Empty, RegionInfo.RegionName + String.Format(": Restarting in {0} Minutes", (int)(seconds / 60.0))); 1016 UUID.Random(), String.Empty, RegionInfo.RegionName + String.Format(": Restarting in {0} Minutes", (int)(seconds / 60.0)));
1017 }
1004 } 1018 }
1005 } 1019 }
1006 1020
@@ -1280,16 +1294,16 @@ namespace OpenSim.Region.Framework.Scenes
1280 // Check if any objects have reached their targets 1294 // Check if any objects have reached their targets
1281 CheckAtTargets(); 1295 CheckAtTargets();
1282 1296
1283 // Update SceneObjectGroups that have scheduled themselves for updates
1284 // Objects queue their updates onto all scene presences
1285 if (m_frame % m_update_objects == 0)
1286 m_sceneGraph.UpdateObjectGroups();
1287
1288 // Run through all ScenePresences looking for updates 1297 // Run through all ScenePresences looking for updates
1289 // Presence updates and queued object updates for each presence are sent to clients 1298 // Presence updates and queued object updates for each presence are sent to clients
1290 if (m_frame % m_update_presences == 0) 1299 if (m_frame % m_update_presences == 0)
1291 m_sceneGraph.UpdatePresences(); 1300 m_sceneGraph.UpdatePresences();
1292 1301
1302 // Update SceneObjectGroups that have scheduled themselves for updates
1303 // Objects queue their updates onto all scene presences
1304 if (m_frame % m_update_objects == 0)
1305 m_sceneGraph.UpdateObjectGroups();
1306
1293 int tmpPhysicsMS2 = Util.EnvironmentTickCount(); 1307 int tmpPhysicsMS2 = Util.EnvironmentTickCount();
1294 if ((m_frame % m_update_physics == 0) && m_physics_enabled) 1308 if ((m_frame % m_update_physics == 0) && m_physics_enabled)
1295 m_sceneGraph.UpdatePreparePhysics(); 1309 m_sceneGraph.UpdatePreparePhysics();
@@ -1600,6 +1614,19 @@ namespace OpenSim.Region.Framework.Scenes
1600 public void SaveTerrain() 1614 public void SaveTerrain()
1601 { 1615 {
1602 m_storageManager.DataStore.StoreTerrain(Heightmap.GetDoubles(), RegionInfo.RegionID); 1616 m_storageManager.DataStore.StoreTerrain(Heightmap.GetDoubles(), RegionInfo.RegionID);
1617 }
1618
1619 public void StoreWindlightProfile(RegionMeta7WindlightData wl)
1620 {
1621 m_regInfo.WindlightSettings = wl;
1622 m_storageManager.DataStore.StoreRegionWindlightSettings(wl);
1623 m_eventManager.TriggerOnSaveNewWindlightProfile();
1624 }
1625
1626 public void LoadWindlightProfile()
1627 {
1628 m_regInfo.WindlightSettings = m_storageManager.DataStore.LoadRegionWindlightSettings(RegionInfo.RegionID);
1629 m_eventManager.TriggerOnSaveNewWindlightProfile();
1603 } 1630 }
1604 1631
1605 /// <summary> 1632 /// <summary>
@@ -3244,6 +3271,9 @@ namespace OpenSim.Region.Framework.Scenes
3244 3271
3245 CapsModule.AddCapsHandler(agent.AgentID); 3272 CapsModule.AddCapsHandler(agent.AgentID);
3246 3273
3274 if ((teleportFlags & ((uint)TeleportFlags.ViaLandmark | (uint)TeleportFlags.ViaLocation | (uint)TeleportFlags.ViaLandmark | (uint)TeleportFlags.Default)) != 0)
3275 System.Threading.Thread.Sleep(2000);
3276
3247 if (!agent.child) 3277 if (!agent.child)
3248 { 3278 {
3249 if (TestBorderCross(agent.startpos,Cardinals.E)) 3279 if (TestBorderCross(agent.startpos,Cardinals.E))
@@ -3302,6 +3332,7 @@ namespace OpenSim.Region.Framework.Scenes
3302 } 3332 }
3303 } 3333 }
3304 // Honor parcel landing type and position. 3334 // Honor parcel landing type and position.
3335 /*
3305 ILandObject land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y); 3336 ILandObject land = LandChannel.GetLandObject(agent.startpos.X, agent.startpos.Y);
3306 if (land != null) 3337 if (land != null)
3307 { 3338 {
@@ -3310,6 +3341,7 @@ namespace OpenSim.Region.Framework.Scenes
3310 agent.startpos = land.LandData.UserLocation; 3341 agent.startpos = land.LandData.UserLocation;
3311 } 3342 }
3312 } 3343 }
3344 */// This is now handled properly in ScenePresence.MakeRootAgent
3313 } 3345 }
3314 3346
3315 agent.teleportFlags = teleportFlags; 3347 agent.teleportFlags = teleportFlags;
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index e87f7ca..8a74d7b 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -300,7 +300,7 @@ namespace OpenSim.Region.Framework.Scenes
300 d); 300 d);
301 } 301 }
302 } 302 }
303 303
304 public List<GridRegion> RequestNamedRegions(string name, int maxNumber) 304 public List<GridRegion> RequestNamedRegions(string name, int maxNumber)
305 { 305 {
306 return m_scene.GridService.GetRegionsByName(UUID.Zero, name, maxNumber); 306 return m_scene.GridService.GetRegionsByName(UUID.Zero, name, maxNumber);
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 369552f..928dc97 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -223,6 +223,30 @@ namespace OpenSim.Region.Framework.Scenes
223 protected internal bool AddRestoredSceneObject( 223 protected internal bool AddRestoredSceneObject(
224 SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted) 224 SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted)
225 { 225 {
226 // KF: Check for out-of-region, move inside and make static.
227 Vector3 npos = new Vector3(sceneObject.RootPart.GroupPosition.X,
228 sceneObject.RootPart.GroupPosition.Y,
229 sceneObject.RootPart.GroupPosition.Z);
230 if (!(((sceneObject.RootPart.Shape.PCode == (byte)PCode.Prim) && (sceneObject.RootPart.Shape.State != 0))) && (npos.X < 0.0 || npos.Y < 0.0 || npos.Z < 0.0 ||
231 npos.X > Constants.RegionSize ||
232 npos.Y > Constants.RegionSize))
233 {
234 if (npos.X < 0.0) npos.X = 1.0f;
235 if (npos.Y < 0.0) npos.Y = 1.0f;
236 if (npos.Z < 0.0) npos.Z = 0.0f;
237 if (npos.X > Constants.RegionSize) npos.X = Constants.RegionSize - 1.0f;
238 if (npos.Y > Constants.RegionSize) npos.Y = Constants.RegionSize - 1.0f;
239
240 foreach (SceneObjectPart part in sceneObject.Children.Values)
241 {
242 part.GroupPosition = npos;
243 }
244 sceneObject.RootPart.Velocity = Vector3.Zero;
245 sceneObject.RootPart.AngularVelocity = Vector3.Zero;
246 sceneObject.RootPart.Acceleration = Vector3.Zero;
247 sceneObject.RootPart.Velocity = Vector3.Zero;
248 }
249
226 if (!alreadyPersisted) 250 if (!alreadyPersisted)
227 { 251 {
228 sceneObject.ForceInventoryPersistence(); 252 sceneObject.ForceInventoryPersistence();
@@ -567,6 +591,18 @@ namespace OpenSim.Region.Framework.Scenes
567 if (group.GetFromItemID() == itemID) 591 if (group.GetFromItemID() == itemID)
568 { 592 {
569 m_parentScene.SendAttachEvent(group.LocalId, itemID, UUID.Zero); 593 m_parentScene.SendAttachEvent(group.LocalId, itemID, UUID.Zero);
594 bool hasScripts = false;
595 foreach (SceneObjectPart part in group.Children.Values)
596 {
597 if (part.Inventory.ContainsScripts())
598 {
599 hasScripts = true;
600 break;
601 }
602 }
603
604 if (hasScripts) // Allow the object to execute the attach(NULL_KEY) event
605 System.Threading.Thread.Sleep(100);
570 group.DetachToInventoryPrep(); 606 group.DetachToInventoryPrep();
571 m_log.Debug("[DETACH]: Saving attachpoint: " + 607 m_log.Debug("[DETACH]: Saving attachpoint: " +
572 ((uint)group.GetAttachmentPoint()).ToString()); 608 ((uint)group.GetAttachmentPoint()).ToString());
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
index 71354b4..8b58b3e 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
@@ -46,12 +46,12 @@ namespace OpenSim.Region.Framework.Scenes
46 /// </summary> 46 /// </summary>
47 public void ForceInventoryPersistence() 47 public void ForceInventoryPersistence()
48 { 48 {
49 lock (m_parts) 49 lockPartsForRead(true);
50 List<SceneObjectPart> values = new List<SceneObjectPart>(m_parts.Values);
51 lockPartsForRead(false);
52 foreach (SceneObjectPart part in values)
50 { 53 {
51 foreach (SceneObjectPart part in m_parts.Values) 54 part.Inventory.ForceInventoryPersistence();
52 {
53 part.Inventory.ForceInventoryPersistence();
54 }
55 } 55 }
56 } 56 }
57 57
@@ -74,19 +74,17 @@ namespace OpenSim.Region.Framework.Scenes
74 /// <summary> 74 /// <summary>
75 /// Stop the scripts contained in all the prims in this group 75 /// Stop the scripts contained in all the prims in this group
76 /// </summary> 76 /// </summary>
77 /// <param name="sceneObjectBeingDeleted">
78 /// Should be true if these scripts are being removed because the scene
79 /// object is being deleted. This will prevent spurious updates to the client.
80 /// </param>
81 public void RemoveScriptInstances(bool sceneObjectBeingDeleted) 77 public void RemoveScriptInstances(bool sceneObjectBeingDeleted)
82 { 78 {
83 lock (m_parts) 79 lockPartsForRead(true);
80 List<SceneObjectPart> values = new List<SceneObjectPart>(m_parts.Values);
81 lockPartsForRead(false);
82
83 foreach (SceneObjectPart part in values)
84 { 84 {
85 foreach (SceneObjectPart part in m_parts.Values) 85 part.Inventory.RemoveScriptInstances(sceneObjectBeingDeleted);
86 {
87 part.Inventory.RemoveScriptInstances(sceneObjectBeingDeleted);
88 }
89 } 86 }
87
90 } 88 }
91 89
92 /// <summary> 90 /// <summary>
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index c5a6171..2a4e5a2 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -106,6 +106,72 @@ namespace OpenSim.Region.Framework.Scenes
106 private bool m_hasGroupChanged = false; 106 private bool m_hasGroupChanged = false;
107 private long timeFirstChanged; 107 private long timeFirstChanged;
108 private long timeLastChanged; 108 private long timeLastChanged;
109 private System.Threading.ReaderWriterLockSlim m_partsLock = new System.Threading.ReaderWriterLockSlim();
110
111 public void lockPartsForRead(bool locked)
112 {
113 if (locked)
114 {
115 if (m_partsLock.RecursiveReadCount > 0)
116 {
117 m_log.Error("[SceneObjectGroup.m_parts] Recursive read lock requested. This should not happen and means something needs to be fixed. For now though, it's safe to continue.");
118 m_partsLock.ExitReadLock();
119 }
120 if (m_partsLock.RecursiveWriteCount > 0)
121 {
122 m_log.Error("[SceneObjectGroup.m_parts] Recursive read lock requested. This should not happen and means something needs to be fixed.");
123 m_partsLock.ExitWriteLock();
124 }
125
126 while (!m_partsLock.TryEnterReadLock(60000))
127 {
128 m_log.Error("[SceneObjectGroup.m_parts] Thread lock detected while trying to aquire READ lock of m_parts in SceneObjectGroup. I'm going to try to solve the thread lock automatically to preserve region stability, but this needs to be fixed.");
129 if (m_partsLock.IsWriteLockHeld)
130 {
131 m_partsLock = new System.Threading.ReaderWriterLockSlim();
132 }
133 }
134 }
135 else
136 {
137 if (m_partsLock.RecursiveReadCount > 0)
138 {
139 m_partsLock.ExitReadLock();
140 }
141 }
142 }
143 public void lockPartsForWrite(bool locked)
144 {
145 if (locked)
146 {
147 if (m_partsLock.RecursiveReadCount > 0)
148 {
149 m_log.Error("[SceneObjectGroup.m_parts] Recursive write lock requested. This should not happen and means something needs to be fixed. For now though, it's safe to continue.");
150 m_partsLock.ExitReadLock();
151 }
152 if (m_partsLock.RecursiveWriteCount > 0)
153 {
154 m_log.Error("[SceneObjectGroup.m_parts] Recursive write lock requested. This should not happen and means something needs to be fixed.");
155 m_partsLock.ExitWriteLock();
156 }
157
158 while (!m_partsLock.TryEnterWriteLock(60000))
159 {
160 m_log.Error("[SceneObjectGroup.m_parts] Thread lock detected while trying to aquire WRITE lock of m_scripts in XEngine. I'm going to try to solve the thread lock automatically to preserve region stability, but this needs to be fixed.");
161 if (m_partsLock.IsWriteLockHeld)
162 {
163 m_partsLock = new System.Threading.ReaderWriterLockSlim();
164 }
165 }
166 }
167 else
168 {
169 if (m_partsLock.RecursiveWriteCount > 0)
170 {
171 m_partsLock.ExitWriteLock();
172 }
173 }
174 }
109 175
110 public bool HasGroupChanged 176 public bool HasGroupChanged
111 { 177 {
@@ -258,13 +324,16 @@ namespace OpenSim.Region.Framework.Scenes
258 set 324 set
259 { 325 {
260 m_regionHandle = value; 326 m_regionHandle = value;
261 lock (m_parts) 327 lockPartsForRead(true);
262 { 328 {
263 foreach (SceneObjectPart part in m_parts.Values) 329 foreach (SceneObjectPart part in m_parts.Values)
264 { 330 {
331
265 part.RegionHandle = m_regionHandle; 332 part.RegionHandle = m_regionHandle;
333
266 } 334 }
267 } 335 }
336 lockPartsForRead(false);
268 } 337 }
269 } 338 }
270 339
@@ -298,6 +367,9 @@ namespace OpenSim.Region.Framework.Scenes
298 { 367 {
299 m_scene.CrossPrimGroupIntoNewRegion(val, this, true); 368 m_scene.CrossPrimGroupIntoNewRegion(val, this, true);
300 } 369 }
370
371 lockPartsForRead(true);
372
301 if (RootPart.GetStatusSandbox()) 373 if (RootPart.GetStatusSandbox())
302 { 374 {
303 if (Util.GetDistanceTo(RootPart.StatusSandboxPos, value) > 10) 375 if (Util.GetDistanceTo(RootPart.StatusSandboxPos, value) > 10)
@@ -305,16 +377,15 @@ namespace OpenSim.Region.Framework.Scenes
305 RootPart.ScriptSetPhysicsStatus(false); 377 RootPart.ScriptSetPhysicsStatus(false);
306 Scene.SimChat(Utils.StringToBytes("Hit Sandbox Limit"), 378 Scene.SimChat(Utils.StringToBytes("Hit Sandbox Limit"),
307 ChatTypeEnum.DebugChannel, 0x7FFFFFFF, RootPart.AbsolutePosition, Name, UUID, false); 379 ChatTypeEnum.DebugChannel, 0x7FFFFFFF, RootPart.AbsolutePosition, Name, UUID, false);
380 lockPartsForRead(false);
308 return; 381 return;
309 } 382 }
310 } 383 }
311 lock (m_parts) 384
312 { 385 foreach (SceneObjectPart part in m_parts.Values)
313 foreach (SceneObjectPart part in m_parts.Values) 386 part.GroupPosition = val;
314 { 387
315 part.GroupPosition = val; 388 lockPartsForRead(false);
316 }
317 }
318 389
319 //if (m_rootPart.PhysActor != null) 390 //if (m_rootPart.PhysActor != null)
320 //{ 391 //{
@@ -504,13 +575,16 @@ namespace OpenSim.Region.Framework.Scenes
504 575
505 public void SetFromItemID(UUID AssetId) 576 public void SetFromItemID(UUID AssetId)
506 { 577 {
507 lock (m_parts) 578 lockPartsForRead(true);
508 { 579 {
509 foreach (SceneObjectPart part in m_parts.Values) 580 foreach (SceneObjectPart part in m_parts.Values)
510 { 581 {
582
511 part.FromItemID = AssetId; 583 part.FromItemID = AssetId;
584
512 } 585 }
513 } 586 }
587 lockPartsForRead(false);
514 } 588 }
515 589
516 public UUID GetFromItemID() 590 public UUID GetFromItemID()
@@ -577,10 +651,11 @@ namespace OpenSim.Region.Framework.Scenes
577 Vector3 maxScale = Vector3.Zero; 651 Vector3 maxScale = Vector3.Zero;
578 Vector3 finalScale = new Vector3(0.5f, 0.5f, 0.5f); 652 Vector3 finalScale = new Vector3(0.5f, 0.5f, 0.5f);
579 653
580 lock (m_parts) 654 lockPartsForRead(true);
581 { 655 {
582 foreach (SceneObjectPart part in m_parts.Values) 656 foreach (SceneObjectPart part in m_parts.Values)
583 { 657 {
658
584 Vector3 partscale = part.Scale; 659 Vector3 partscale = part.Scale;
585 Vector3 partoffset = part.OffsetPosition; 660 Vector3 partoffset = part.OffsetPosition;
586 661
@@ -591,8 +666,11 @@ namespace OpenSim.Region.Framework.Scenes
591 maxScale.X = (partscale.X + partoffset.X > maxScale.X) ? partscale.X + partoffset.X : maxScale.X; 666 maxScale.X = (partscale.X + partoffset.X > maxScale.X) ? partscale.X + partoffset.X : maxScale.X;
592 maxScale.Y = (partscale.Y + partoffset.Y > maxScale.Y) ? partscale.Y + partoffset.Y : maxScale.Y; 667 maxScale.Y = (partscale.Y + partoffset.Y > maxScale.Y) ? partscale.Y + partoffset.Y : maxScale.Y;
593 maxScale.Z = (partscale.Z + partoffset.Z > maxScale.Z) ? partscale.Z + partoffset.Z : maxScale.Z; 668 maxScale.Z = (partscale.Z + partoffset.Z > maxScale.Z) ? partscale.Z + partoffset.Z : maxScale.Z;
669
594 } 670 }
595 } 671 }
672 lockPartsForRead(false);
673
596 finalScale.X = (minScale.X > maxScale.X) ? minScale.X : maxScale.X; 674 finalScale.X = (minScale.X > maxScale.X) ? minScale.X : maxScale.X;
597 finalScale.Y = (minScale.Y > maxScale.Y) ? minScale.Y : maxScale.Y; 675 finalScale.Y = (minScale.Y > maxScale.Y) ? minScale.Y : maxScale.Y;
598 finalScale.Z = (minScale.Z > maxScale.Z) ? minScale.Z : maxScale.Z; 676 finalScale.Z = (minScale.Z > maxScale.Z) ? minScale.Z : maxScale.Z;
@@ -608,10 +686,11 @@ namespace OpenSim.Region.Framework.Scenes
608 686
609 EntityIntersection result = new EntityIntersection(); 687 EntityIntersection result = new EntityIntersection();
610 688
611 lock (m_parts) 689 lockPartsForRead(true);
612 { 690 {
613 foreach (SceneObjectPart part in m_parts.Values) 691 foreach (SceneObjectPart part in m_parts.Values)
614 { 692 {
693
615 // Temporary commented to stop compiler warning 694 // Temporary commented to stop compiler warning
616 //Vector3 partPosition = 695 //Vector3 partPosition =
617 // new Vector3(part.AbsolutePosition.X, part.AbsolutePosition.Y, part.AbsolutePosition.Z); 696 // new Vector3(part.AbsolutePosition.X, part.AbsolutePosition.Y, part.AbsolutePosition.Z);
@@ -639,8 +718,10 @@ namespace OpenSim.Region.Framework.Scenes
639 result.distance = inter.distance; 718 result.distance = inter.distance;
640 } 719 }
641 } 720 }
721
642 } 722 }
643 } 723 }
724 lockPartsForRead(false);
644 return result; 725 return result;
645 } 726 }
646 727
@@ -653,10 +734,11 @@ namespace OpenSim.Region.Framework.Scenes
653 public Vector3 GetAxisAlignedBoundingBox(out float offsetHeight) 734 public Vector3 GetAxisAlignedBoundingBox(out float offsetHeight)
654 { 735 {
655 float maxX = -256f, maxY = -256f, maxZ = -256f, minX = 256f, minY = 256f, minZ = 256f; 736 float maxX = -256f, maxY = -256f, maxZ = -256f, minX = 256f, minY = 256f, minZ = 256f;
656 lock (m_parts) 737 lockPartsForRead(true);
657 { 738 {
658 foreach (SceneObjectPart part in m_parts.Values) 739 foreach (SceneObjectPart part in m_parts.Values)
659 { 740 {
741
660 Vector3 worldPos = part.GetWorldPosition(); 742 Vector3 worldPos = part.GetWorldPosition();
661 Vector3 offset = worldPos - AbsolutePosition; 743 Vector3 offset = worldPos - AbsolutePosition;
662 Quaternion worldRot; 744 Quaternion worldRot;
@@ -715,6 +797,8 @@ namespace OpenSim.Region.Framework.Scenes
715 backBottomRight.Y = orig.Y + (part.Scale.Y / 2); 797 backBottomRight.Y = orig.Y + (part.Scale.Y / 2);
716 backBottomRight.Z = orig.Z - (part.Scale.Z / 2); 798 backBottomRight.Z = orig.Z - (part.Scale.Z / 2);
717 799
800
801
718 //m_log.InfoFormat("pre corner 1 is {0} {1} {2}", frontTopLeft.X, frontTopLeft.Y, frontTopLeft.Z); 802 //m_log.InfoFormat("pre corner 1 is {0} {1} {2}", frontTopLeft.X, frontTopLeft.Y, frontTopLeft.Z);
719 //m_log.InfoFormat("pre corner 2 is {0} {1} {2}", frontTopRight.X, frontTopRight.Y, frontTopRight.Z); 803 //m_log.InfoFormat("pre corner 2 is {0} {1} {2}", frontTopRight.X, frontTopRight.Y, frontTopRight.Z);
720 //m_log.InfoFormat("pre corner 3 is {0} {1} {2}", frontBottomRight.X, frontBottomRight.Y, frontBottomRight.Z); 804 //m_log.InfoFormat("pre corner 3 is {0} {1} {2}", frontBottomRight.X, frontBottomRight.Y, frontBottomRight.Z);
@@ -886,6 +970,7 @@ namespace OpenSim.Region.Framework.Scenes
886 minZ = backBottomLeft.Z; 970 minZ = backBottomLeft.Z;
887 } 971 }
888 } 972 }
973 lockPartsForRead(false);
889 974
890 Vector3 boundingBox = new Vector3(maxX - minX, maxY - minY, maxZ - minZ); 975 Vector3 boundingBox = new Vector3(maxX - minX, maxY - minY, maxZ - minZ);
891 976
@@ -914,17 +999,20 @@ namespace OpenSim.Region.Framework.Scenes
914 Dictionary<UUID,string> states = new Dictionary<UUID,string>(); 999 Dictionary<UUID,string> states = new Dictionary<UUID,string>();
915 1000
916 // Capture script state while holding the lock 1001 // Capture script state while holding the lock
917 lock (m_parts) 1002 lockPartsForRead(true);
918 { 1003 {
919 foreach (SceneObjectPart part in m_parts.Values) 1004 foreach (SceneObjectPart part in m_parts.Values)
920 { 1005 {
1006
921 Dictionary<UUID,string> pstates = part.Inventory.GetScriptStates(); 1007 Dictionary<UUID,string> pstates = part.Inventory.GetScriptStates();
922 foreach (UUID itemid in pstates.Keys) 1008 foreach (UUID itemid in pstates.Keys)
923 { 1009 {
924 states.Add(itemid, pstates[itemid]); 1010 states.Add(itemid, pstates[itemid]);
925 } 1011 }
1012
926 } 1013 }
927 } 1014 }
1015 lockPartsForRead(false);
928 1016
929 if (states.Count > 0) 1017 if (states.Count > 0)
930 { 1018 {
@@ -1086,13 +1174,16 @@ namespace OpenSim.Region.Framework.Scenes
1086 1174
1087 public override void UpdateMovement() 1175 public override void UpdateMovement()
1088 { 1176 {
1089 lock (m_parts) 1177 lockPartsForRead(true);
1090 { 1178 {
1091 foreach (SceneObjectPart part in m_parts.Values) 1179 foreach (SceneObjectPart part in m_parts.Values)
1092 { 1180 {
1181
1093 part.UpdateMovement(); 1182 part.UpdateMovement();
1183
1094 } 1184 }
1095 } 1185 }
1186 lockPartsForRead(false);
1096 } 1187 }
1097 1188
1098 public ushort GetTimeDilation() 1189 public ushort GetTimeDilation()
@@ -1136,7 +1227,7 @@ namespace OpenSim.Region.Framework.Scenes
1136 /// <param name="part"></param> 1227 /// <param name="part"></param>
1137 public void AddPart(SceneObjectPart part) 1228 public void AddPart(SceneObjectPart part)
1138 { 1229 {
1139 lock (m_parts) 1230 lockPartsForWrite(true);
1140 { 1231 {
1141 part.SetParent(this); 1232 part.SetParent(this);
1142 m_parts.Add(part.UUID, part); 1233 m_parts.Add(part.UUID, part);
@@ -1146,6 +1237,7 @@ namespace OpenSim.Region.Framework.Scenes
1146 if (part.LinkNum == 2 && RootPart != null) 1237 if (part.LinkNum == 2 && RootPart != null)
1147 RootPart.LinkNum = 1; 1238 RootPart.LinkNum = 1;
1148 } 1239 }
1240 lockPartsForWrite(false);
1149 } 1241 }
1150 1242
1151 /// <summary> 1243 /// <summary>
@@ -1153,28 +1245,33 @@ namespace OpenSim.Region.Framework.Scenes
1153 /// </summary> 1245 /// </summary>
1154 private void UpdateParentIDs() 1246 private void UpdateParentIDs()
1155 { 1247 {
1156 lock (m_parts) 1248 lockPartsForRead(true);
1157 { 1249 {
1158 foreach (SceneObjectPart part in m_parts.Values) 1250 foreach (SceneObjectPart part in m_parts.Values)
1159 { 1251 {
1252
1160 if (part.UUID != m_rootPart.UUID) 1253 if (part.UUID != m_rootPart.UUID)
1161 { 1254 {
1162 part.ParentID = m_rootPart.LocalId; 1255 part.ParentID = m_rootPart.LocalId;
1163 } 1256 }
1257
1164 } 1258 }
1165 } 1259 }
1260 lockPartsForRead(false);
1166 } 1261 }
1167 1262
1168 public void RegenerateFullIDs() 1263 public void RegenerateFullIDs()
1169 { 1264 {
1170 lock (m_parts) 1265 lockPartsForRead(true);
1171 { 1266 {
1172 foreach (SceneObjectPart part in m_parts.Values) 1267 foreach (SceneObjectPart part in m_parts.Values)
1173 { 1268 {
1269
1174 part.UUID = UUID.Random(); 1270 part.UUID = UUID.Random();
1175 1271
1176 } 1272 }
1177 } 1273 }
1274 lockPartsForRead(false);
1178 } 1275 }
1179 1276
1180 // helper provided for parts. 1277 // helper provided for parts.
@@ -1255,29 +1352,33 @@ namespace OpenSim.Region.Framework.Scenes
1255 1352
1256 DetachFromBackup(); 1353 DetachFromBackup();
1257 1354
1258 lock (m_parts) 1355 lockPartsForRead(true);
1356 List<SceneObjectPart> values = new List<SceneObjectPart>(m_parts.Values);
1357 lockPartsForRead(false);
1358
1359 foreach (SceneObjectPart part in values)
1259 { 1360 {
1260 foreach (SceneObjectPart part in m_parts.Values)
1261 {
1262// part.Inventory.RemoveScriptInstances(); 1361// part.Inventory.RemoveScriptInstances();
1263 1362
1264 ScenePresence[] avatars = Scene.GetScenePresences(); 1363 ScenePresence[] avatars = Scene.GetScenePresences();
1265 for (int i = 0; i < avatars.Length; i++) 1364 for (int i = 0; i < avatars.Length; i++)
1365 {
1366 if (avatars[i].ParentID == LocalId)
1266 { 1367 {
1267 if (avatars[i].ParentID == LocalId) 1368 avatars[i].StandUp();
1268 { 1369 }
1269 avatars[i].StandUp();
1270 }
1271 1370
1272 if (!silent) 1371 if (!silent)
1273 { 1372 {
1274 part.UpdateFlag = 0; 1373 part.UpdateFlag = 0;
1275 if (part == m_rootPart) 1374 if (part == m_rootPart)
1276 avatars[i].ControllingClient.SendKillObject(m_regionHandle, part.LocalId); 1375 avatars[i].ControllingClient.SendKillObject(m_regionHandle, part.LocalId);
1277 }
1278 } 1376 }
1279 } 1377 }
1378
1280 } 1379 }
1380
1381
1281 } 1382 }
1282 1383
1283 public void AddScriptLPS(int count) 1384 public void AddScriptLPS(int count)
@@ -1302,17 +1403,20 @@ namespace OpenSim.Region.Framework.Scenes
1302 1403
1303 scriptEvents aggregateScriptEvents=0; 1404 scriptEvents aggregateScriptEvents=0;
1304 1405
1305 lock (m_parts) 1406 lockPartsForRead(true);
1306 { 1407 {
1307 foreach (SceneObjectPart part in m_parts.Values) 1408 foreach (SceneObjectPart part in m_parts.Values)
1308 { 1409 {
1410
1309 if (part == null) 1411 if (part == null)
1310 continue; 1412 continue;
1311 if (part != RootPart) 1413 if (part != RootPart)
1312 part.ObjectFlags = objectflagupdate; 1414 part.ObjectFlags = objectflagupdate;
1313 aggregateScriptEvents |= part.AggregateScriptEvents; 1415 aggregateScriptEvents |= part.AggregateScriptEvents;
1416
1314 } 1417 }
1315 } 1418 }
1419 lockPartsForRead(false);
1316 1420
1317 m_scriptListens_atTarget = ((aggregateScriptEvents & scriptEvents.at_target) != 0); 1421 m_scriptListens_atTarget = ((aggregateScriptEvents & scriptEvents.at_target) != 0);
1318 m_scriptListens_notAtTarget = ((aggregateScriptEvents & scriptEvents.not_at_target) != 0); 1422 m_scriptListens_notAtTarget = ((aggregateScriptEvents & scriptEvents.not_at_target) != 0);
@@ -1354,42 +1458,52 @@ namespace OpenSim.Region.Framework.Scenes
1354 /// <param name="m_physicalPrim"></param> 1458 /// <param name="m_physicalPrim"></param>
1355 public void ApplyPhysics(bool m_physicalPrim) 1459 public void ApplyPhysics(bool m_physicalPrim)
1356 { 1460 {
1357 lock (m_parts) 1461 lockPartsForRead(true);
1462
1463 if (m_parts.Count > 1)
1358 { 1464 {
1359 if (m_parts.Count > 1) 1465 List<SceneObjectPart> values = new List<SceneObjectPart>(m_parts.Values);
1466 lockPartsForRead(false);
1467 m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive, m_physicalPrim);
1468 foreach (SceneObjectPart part in values)
1360 { 1469 {
1361 m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive, m_physicalPrim); 1470
1362 foreach (SceneObjectPart part in m_parts.Values) 1471 if (part.LocalId != m_rootPart.LocalId)
1363 { 1472 {
1364 if (part.LocalId != m_rootPart.LocalId) 1473 part.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), part.VolumeDetectActive, m_physicalPrim);
1365 {
1366 part.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), part.VolumeDetectActive, m_physicalPrim);
1367 }
1368 } 1474 }
1369 1475
1370 // Hack to get the physics scene geometries in the right spot
1371 ResetChildPrimPhysicsPositions();
1372 }
1373 else
1374 {
1375 m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive, m_physicalPrim);
1376 } 1476 }
1477 // Hack to get the physics scene geometries in the right spot
1478 ResetChildPrimPhysicsPositions();
1479 }
1480 else
1481 {
1482 lockPartsForRead(false);
1483 m_rootPart.ApplyPhysics(m_rootPart.GetEffectiveObjectFlags(), m_rootPart.VolumeDetectActive, m_physicalPrim);
1377 } 1484 }
1378 } 1485 }
1379 1486
1380 public void SetOwnerId(UUID userId) 1487 public void SetOwnerId(UUID userId)
1381 { 1488 {
1382 ForEachPart(delegate(SceneObjectPart part) { part.OwnerID = userId; }); 1489 ForEachPart(delegate(SceneObjectPart part)
1490 {
1491
1492 part.OwnerID = userId;
1493
1494 });
1383 } 1495 }
1384 1496
1385 public void ForEachPart(Action<SceneObjectPart> whatToDo) 1497 public void ForEachPart(Action<SceneObjectPart> whatToDo)
1386 { 1498 {
1387 lock (m_parts) 1499 lockPartsForRead(true);
1500 List<SceneObjectPart> values = new List<SceneObjectPart>(m_parts.Values);
1501 lockPartsForRead(false);
1502 foreach (SceneObjectPart part in values)
1388 { 1503 {
1389 foreach (SceneObjectPart part in m_parts.Values) 1504
1390 { 1505 whatToDo(part);
1391 whatToDo(part); 1506
1392 }
1393 } 1507 }
1394 } 1508 }
1395 1509
@@ -1488,14 +1602,17 @@ namespace OpenSim.Region.Framework.Scenes
1488 { 1602 {
1489 SendPartFullUpdate(remoteClient, RootPart, m_scene.Permissions.GenerateClientFlags(remoteClient.AgentId, RootPart.UUID)); 1603 SendPartFullUpdate(remoteClient, RootPart, m_scene.Permissions.GenerateClientFlags(remoteClient.AgentId, RootPart.UUID));
1490 1604
1491 lock (m_parts) 1605 lockPartsForRead(true);
1492 { 1606 {
1493 foreach (SceneObjectPart part in m_parts.Values) 1607 foreach (SceneObjectPart part in m_parts.Values)
1494 { 1608 {
1609
1495 if (part != RootPart) 1610 if (part != RootPart)
1496 SendPartFullUpdate(remoteClient, part, m_scene.Permissions.GenerateClientFlags(remoteClient.AgentId, part.UUID)); 1611 SendPartFullUpdate(remoteClient, part, m_scene.Permissions.GenerateClientFlags(remoteClient.AgentId, part.UUID));
1612
1497 } 1613 }
1498 } 1614 }
1615 lockPartsForRead(false);
1499 } 1616 }
1500 1617
1501 /// <summary> 1618 /// <summary>
@@ -1593,10 +1710,11 @@ namespace OpenSim.Region.Framework.Scenes
1593 1710
1594 List<SceneObjectPart> partList; 1711 List<SceneObjectPart> partList;
1595 1712
1596 lock (m_parts) 1713 lockPartsForRead(true);
1597 { 1714
1598 partList = new List<SceneObjectPart>(m_parts.Values); 1715 partList = new List<SceneObjectPart>(m_parts.Values);
1599 } 1716
1717 lockPartsForRead(false);
1600 1718
1601 partList.Sort(delegate(SceneObjectPart p1, SceneObjectPart p2) 1719 partList.Sort(delegate(SceneObjectPart p1, SceneObjectPart p2)
1602 { 1720 {
@@ -1893,10 +2011,11 @@ namespace OpenSim.Region.Framework.Scenes
1893 SceneObjectPart newPart = part.Copy(m_scene.AllocateLocalId(), OwnerID, GroupID, m_parts.Count, userExposed); 2011 SceneObjectPart newPart = part.Copy(m_scene.AllocateLocalId(), OwnerID, GroupID, m_parts.Count, userExposed);
1894 newPart.SetParent(this); 2012 newPart.SetParent(this);
1895 2013
1896 lock (m_parts) 2014 lockPartsForWrite(true);
1897 { 2015 {
1898 m_parts.Add(newPart.UUID, newPart); 2016 m_parts.Add(newPart.UUID, newPart);
1899 } 2017 }
2018 lockPartsForWrite(false);
1900 2019
1901 SetPartAsNonRoot(newPart); 2020 SetPartAsNonRoot(newPart);
1902 2021
@@ -1959,7 +2078,7 @@ namespace OpenSim.Region.Framework.Scenes
1959 //if ((RootPart.Flags & PrimFlags.TemporaryOnRez) != 0) 2078 //if ((RootPart.Flags & PrimFlags.TemporaryOnRez) != 0)
1960 // return; 2079 // return;
1961 2080
1962 lock (m_parts) 2081 lockPartsForRead(true);
1963 { 2082 {
1964 bool UsePhysics = ((RootPart.Flags & PrimFlags.Physics) != 0); 2083 bool UsePhysics = ((RootPart.Flags & PrimFlags.Physics) != 0);
1965 2084
@@ -1979,34 +2098,43 @@ namespace OpenSim.Region.Framework.Scenes
1979 { 2098 {
1980 if (!IsSelected) 2099 if (!IsSelected)
1981 part.UpdateLookAt(); 2100 part.UpdateLookAt();
2101
1982 part.SendScheduledUpdates(); 2102 part.SendScheduledUpdates();
2103
1983 } 2104 }
1984 } 2105 }
2106 lockPartsForRead(false);
1985 } 2107 }
1986 2108
1987 public void ScheduleFullUpdateToAvatar(ScenePresence presence) 2109 public void ScheduleFullUpdateToAvatar(ScenePresence presence)
1988 { 2110 {
1989 RootPart.AddFullUpdateToAvatar(presence); 2111 RootPart.AddFullUpdateToAvatar(presence);
1990 2112
1991 lock (m_parts) 2113 lockPartsForRead(true);
1992 { 2114 {
1993 foreach (SceneObjectPart part in m_parts.Values) 2115 foreach (SceneObjectPart part in m_parts.Values)
1994 { 2116 {
2117
1995 if (part != RootPart) 2118 if (part != RootPart)
1996 part.AddFullUpdateToAvatar(presence); 2119 part.AddFullUpdateToAvatar(presence);
2120
1997 } 2121 }
1998 } 2122 }
2123 lockPartsForRead(false);
1999 } 2124 }
2000 2125
2001 public void ScheduleTerseUpdateToAvatar(ScenePresence presence) 2126 public void ScheduleTerseUpdateToAvatar(ScenePresence presence)
2002 { 2127 {
2003 lock (m_parts) 2128 lockPartsForRead(true);
2004 { 2129 {
2005 foreach (SceneObjectPart part in m_parts.Values) 2130 foreach (SceneObjectPart part in m_parts.Values)
2006 { 2131 {
2132
2007 part.AddTerseUpdateToAvatar(presence); 2133 part.AddTerseUpdateToAvatar(presence);
2134
2008 } 2135 }
2009 } 2136 }
2137 lockPartsForRead(false);
2010 } 2138 }
2011 2139
2012 /// <summary> 2140 /// <summary>
@@ -2017,14 +2145,17 @@ namespace OpenSim.Region.Framework.Scenes
2017 checkAtTargets(); 2145 checkAtTargets();
2018 RootPart.ScheduleFullUpdate(); 2146 RootPart.ScheduleFullUpdate();
2019 2147
2020 lock (m_parts) 2148 lockPartsForRead(true);
2021 { 2149 {
2022 foreach (SceneObjectPart part in m_parts.Values) 2150 foreach (SceneObjectPart part in m_parts.Values)
2023 { 2151 {
2152
2024 if (part != RootPart) 2153 if (part != RootPart)
2025 part.ScheduleFullUpdate(); 2154 part.ScheduleFullUpdate();
2155
2026 } 2156 }
2027 } 2157 }
2158 lockPartsForRead(false);
2028 } 2159 }
2029 2160
2030 /// <summary> 2161 /// <summary>
@@ -2032,13 +2163,16 @@ namespace OpenSim.Region.Framework.Scenes
2032 /// </summary> 2163 /// </summary>
2033 public void ScheduleGroupForTerseUpdate() 2164 public void ScheduleGroupForTerseUpdate()
2034 { 2165 {
2035 lock (m_parts) 2166 lockPartsForRead(true);
2036 { 2167 {
2037 foreach (SceneObjectPart part in m_parts.Values) 2168 foreach (SceneObjectPart part in m_parts.Values)
2038 { 2169 {
2170
2039 part.ScheduleTerseUpdate(); 2171 part.ScheduleTerseUpdate();
2172
2040 } 2173 }
2041 } 2174 }
2175 lockPartsForRead(false);
2042 } 2176 }
2043 2177
2044 /// <summary> 2178 /// <summary>
@@ -2051,14 +2185,17 @@ namespace OpenSim.Region.Framework.Scenes
2051 2185
2052 RootPart.SendFullUpdateToAllClients(); 2186 RootPart.SendFullUpdateToAllClients();
2053 2187
2054 lock (m_parts) 2188 lockPartsForRead(true);
2055 { 2189 {
2056 foreach (SceneObjectPart part in m_parts.Values) 2190 foreach (SceneObjectPart part in m_parts.Values)
2057 { 2191 {
2192
2058 if (part != RootPart) 2193 if (part != RootPart)
2059 part.SendFullUpdateToAllClients(); 2194 part.SendFullUpdateToAllClients();
2195
2060 } 2196 }
2061 } 2197 }
2198 lockPartsForRead(false);
2062 } 2199 }
2063 2200
2064 /// <summary> 2201 /// <summary>
@@ -2089,14 +2226,15 @@ namespace OpenSim.Region.Framework.Scenes
2089 { 2226 {
2090 if (IsDeleted) 2227 if (IsDeleted)
2091 return; 2228 return;
2092 2229
2093 lock (m_parts) 2230 lockPartsForRead(true);
2094 { 2231 {
2095 foreach (SceneObjectPart part in m_parts.Values) 2232 foreach (SceneObjectPart part in m_parts.Values)
2096 { 2233 {
2097 part.SendTerseUpdateToAllClients(); 2234 part.SendTerseUpdateToAllClients();
2098 } 2235 }
2099 } 2236 }
2237 lockPartsForRead(false);
2100 } 2238 }
2101 2239
2102 #endregion 2240 #endregion
@@ -2110,16 +2248,18 @@ namespace OpenSim.Region.Framework.Scenes
2110 /// <returns>null if no child part with that linknum or child part</returns> 2248 /// <returns>null if no child part with that linknum or child part</returns>
2111 public SceneObjectPart GetLinkNumPart(int linknum) 2249 public SceneObjectPart GetLinkNumPart(int linknum)
2112 { 2250 {
2113 lock (m_parts) 2251 lockPartsForRead(true);
2114 { 2252 {
2115 foreach (SceneObjectPart part in m_parts.Values) 2253 foreach (SceneObjectPart part in m_parts.Values)
2116 { 2254 {
2117 if (part.LinkNum == linknum) 2255 if (part.LinkNum == linknum)
2118 { 2256 {
2257 lockPartsForRead(false);
2119 return part; 2258 return part;
2120 } 2259 }
2121 } 2260 }
2122 } 2261 }
2262 lockPartsForRead(false);
2123 2263
2124 return null; 2264 return null;
2125 } 2265 }
@@ -2147,17 +2287,19 @@ namespace OpenSim.Region.Framework.Scenes
2147 public SceneObjectPart GetChildPart(uint localID) 2287 public SceneObjectPart GetChildPart(uint localID)
2148 { 2288 {
2149 //m_log.DebugFormat("Entered looking for {0}", localID); 2289 //m_log.DebugFormat("Entered looking for {0}", localID);
2150 lock (m_parts) 2290 lockPartsForRead(true);
2151 { 2291 {
2152 foreach (SceneObjectPart part in m_parts.Values) 2292 foreach (SceneObjectPart part in m_parts.Values)
2153 { 2293 {
2154 //m_log.DebugFormat("Found {0}", part.LocalId); 2294 //m_log.DebugFormat("Found {0}", part.LocalId);
2155 if (part.LocalId == localID) 2295 if (part.LocalId == localID)
2156 { 2296 {
2297 lockPartsForRead(false);
2157 return part; 2298 return part;
2158 } 2299 }
2159 } 2300 }
2160 } 2301 }
2302 lockPartsForRead(false);
2161 2303
2162 return null; 2304 return null;
2163 } 2305 }
@@ -2187,17 +2329,19 @@ namespace OpenSim.Region.Framework.Scenes
2187 public bool HasChildPrim(uint localID) 2329 public bool HasChildPrim(uint localID)
2188 { 2330 {
2189 //m_log.DebugFormat("Entered HasChildPrim looking for {0}", localID); 2331 //m_log.DebugFormat("Entered HasChildPrim looking for {0}", localID);
2190 lock (m_parts) 2332 lockPartsForRead(true);
2191 { 2333 {
2192 foreach (SceneObjectPart part in m_parts.Values) 2334 foreach (SceneObjectPart part in m_parts.Values)
2193 { 2335 {
2194 //m_log.DebugFormat("Found {0}", part.LocalId); 2336 //m_log.DebugFormat("Found {0}", part.LocalId);
2195 if (part.LocalId == localID) 2337 if (part.LocalId == localID)
2196 { 2338 {
2339 lockPartsForRead(false);
2197 return true; 2340 return true;
2198 } 2341 }
2199 } 2342 }
2200 } 2343 }
2344 lockPartsForRead(false);
2201 2345
2202 return false; 2346 return false;
2203 } 2347 }
@@ -2247,53 +2391,57 @@ namespace OpenSim.Region.Framework.Scenes
2247 if (m_rootPart.LinkNum == 0) 2391 if (m_rootPart.LinkNum == 0)
2248 m_rootPart.LinkNum = 1; 2392 m_rootPart.LinkNum = 1;
2249 2393
2250 lock (m_parts) 2394 lockPartsForWrite(true);
2251 { 2395
2252 m_parts.Add(linkPart.UUID, linkPart); 2396 m_parts.Add(linkPart.UUID, linkPart);
2397
2398 lockPartsForWrite(false);
2253 2399
2254 // Insert in terms of link numbers, the new links 2400 // Insert in terms of link numbers, the new links
2255 // before the current ones (with the exception of 2401 // before the current ones (with the exception of
2256 // the root prim. Shuffle the old ones up 2402 // the root prim. Shuffle the old ones up
2257 foreach (KeyValuePair<UUID, SceneObjectPart> kvp in m_parts) 2403 lockPartsForRead(true);
2404 foreach (KeyValuePair<UUID, SceneObjectPart> kvp in m_parts)
2405 {
2406 if (kvp.Value.LinkNum != 1)
2258 { 2407 {
2259 if (kvp.Value.LinkNum != 1) 2408 // Don't update root prim link number
2260 { 2409 kvp.Value.LinkNum += objectGroup.PrimCount;
2261 // Don't update root prim link number
2262 kvp.Value.LinkNum += objectGroup.PrimCount;
2263 }
2264 } 2410 }
2411 }
2412 lockPartsForRead(false);
2265 2413
2266 linkPart.LinkNum = 2; 2414 linkPart.LinkNum = 2;
2267 2415
2268 linkPart.SetParent(this); 2416 linkPart.SetParent(this);
2269 linkPart.AddFlag(PrimFlags.CreateSelected); 2417 linkPart.AddFlag(PrimFlags.CreateSelected);
2270 2418
2271 //if (linkPart.PhysActor != null) 2419 //if (linkPart.PhysActor != null)
2272 //{ 2420 //{
2273 // m_scene.PhysicsScene.RemovePrim(linkPart.PhysActor); 2421 // m_scene.PhysicsScene.RemovePrim(linkPart.PhysActor);
2274 2422
2275 //linkPart.PhysActor = null; 2423 //linkPart.PhysActor = null;
2276 //} 2424 //}
2277 2425
2278 //TODO: rest of parts 2426 //TODO: rest of parts
2279 int linkNum = 3; 2427 int linkNum = 3;
2280 foreach (SceneObjectPart part in objectGroup.Children.Values) 2428 foreach (SceneObjectPart part in objectGroup.Children.Values)
2429 {
2430 if (part.UUID != objectGroup.m_rootPart.UUID)
2281 { 2431 {
2282 if (part.UUID != objectGroup.m_rootPart.UUID) 2432 LinkNonRootPart(part, oldGroupPosition, oldRootRotation, linkNum++);
2283 {
2284 LinkNonRootPart(part, oldGroupPosition, oldRootRotation, linkNum++);
2285 }
2286 part.ClearUndoState();
2287 } 2433 }
2434 part.ClearUndoState();
2288 } 2435 }
2289 2436
2290 m_scene.UnlinkSceneObject(objectGroup.UUID, true); 2437 m_scene.UnlinkSceneObject(objectGroup.UUID, true);
2291 objectGroup.m_isDeleted = true; 2438 objectGroup.m_isDeleted = true;
2439
2440 objectGroup.lockPartsForWrite(true);
2292 2441
2293 lock (objectGroup.m_parts) 2442 objectGroup.m_parts.Clear();
2294 { 2443
2295 objectGroup.m_parts.Clear(); 2444 objectGroup.lockPartsForWrite(false);
2296 }
2297 2445
2298 // Can't do this yet since backup still makes use of the root part without any synchronization 2446 // Can't do this yet since backup still makes use of the root part without any synchronization
2299// objectGroup.m_rootPart = null; 2447// objectGroup.m_rootPart = null;
@@ -2363,11 +2511,12 @@ namespace OpenSim.Region.Framework.Scenes
2363 Quaternion worldRot = linkPart.GetWorldRotation(); 2511 Quaternion worldRot = linkPart.GetWorldRotation();
2364 2512
2365 // Remove the part from this object 2513 // Remove the part from this object
2366 lock (m_parts) 2514 lockPartsForWrite(true);
2367 { 2515 {
2368 m_parts.Remove(linkPart.UUID); 2516 m_parts.Remove(linkPart.UUID);
2369 } 2517 }
2370 2518 lockPartsForWrite(false);
2519 lockPartsForRead(true);
2371 if (m_parts.Count == 1 && RootPart != null) //Single prim is left 2520 if (m_parts.Count == 1 && RootPart != null) //Single prim is left
2372 RootPart.LinkNum = 0; 2521 RootPart.LinkNum = 0;
2373 else 2522 else
@@ -2378,6 +2527,7 @@ namespace OpenSim.Region.Framework.Scenes
2378 p.LinkNum--; 2527 p.LinkNum--;
2379 } 2528 }
2380 } 2529 }
2530 lockPartsForRead(false);
2381 2531
2382 linkPart.ParentID = 0; 2532 linkPart.ParentID = 0;
2383 linkPart.LinkNum = 0; 2533 linkPart.LinkNum = 0;
@@ -2699,9 +2849,12 @@ namespace OpenSim.Region.Framework.Scenes
2699 2849
2700 if (selectionPart != null) 2850 if (selectionPart != null)
2701 { 2851 {
2702 lock (m_parts) 2852 lockPartsForRead(true);
2853 List<SceneObjectPart> parts = new List<SceneObjectPart>(m_parts.Values);
2854 lockPartsForRead(false);
2855 foreach (SceneObjectPart part in parts)
2703 { 2856 {
2704 foreach (SceneObjectPart part in m_parts.Values) 2857 if (part.Scale.X > 10.0 || part.Scale.Y > 10.0 || part.Scale.Z > 10.0)
2705 { 2858 {
2706 if (part.Scale.X > m_scene.RegionInfo.PhysPrimMax || 2859 if (part.Scale.X > m_scene.RegionInfo.PhysPrimMax ||
2707 part.Scale.Y > m_scene.RegionInfo.PhysPrimMax || 2860 part.Scale.Y > m_scene.RegionInfo.PhysPrimMax ||
@@ -2711,12 +2864,13 @@ namespace OpenSim.Region.Framework.Scenes
2711 break; 2864 break;
2712 } 2865 }
2713 } 2866 }
2867 }
2714 2868
2715 foreach (SceneObjectPart part in m_parts.Values) 2869 foreach (SceneObjectPart part in parts)
2716 { 2870 {
2717 part.UpdatePrimFlags(UsePhysics, IsTemporary, IsPhantom, IsVolumeDetect); 2871 part.UpdatePrimFlags(UsePhysics, IsTemporary, IsPhantom, IsVolumeDetect);
2718 }
2719 } 2872 }
2873
2720 } 2874 }
2721 } 2875 }
2722 2876
@@ -2802,11 +2956,9 @@ namespace OpenSim.Region.Framework.Scenes
2802 scale.Y = m_scene.m_maxNonphys; 2956 scale.Y = m_scene.m_maxNonphys;
2803 if (scale.Z > m_scene.m_maxNonphys) 2957 if (scale.Z > m_scene.m_maxNonphys)
2804 scale.Z = m_scene.m_maxNonphys; 2958 scale.Z = m_scene.m_maxNonphys;
2805
2806 SceneObjectPart part = GetChildPart(localID); 2959 SceneObjectPart part = GetChildPart(localID);
2807 if (part != null) 2960 if (part != null)
2808 { 2961 {
2809 part.Resize(scale);
2810 if (part.PhysActor != null) 2962 if (part.PhysActor != null)
2811 { 2963 {
2812 if (part.PhysActor.IsPhysical) 2964 if (part.PhysActor.IsPhysical)
@@ -2821,7 +2973,7 @@ namespace OpenSim.Region.Framework.Scenes
2821 part.PhysActor.Size = scale; 2973 part.PhysActor.Size = scale;
2822 m_scene.PhysicsScene.AddPhysicsActorTaint(part.PhysActor); 2974 m_scene.PhysicsScene.AddPhysicsActorTaint(part.PhysActor);
2823 } 2975 }
2824 //if (part.UUID != m_rootPart.UUID) 2976 part.Resize(scale);
2825 2977
2826 HasGroupChanged = true; 2978 HasGroupChanged = true;
2827 ScheduleGroupForFullUpdate(); 2979 ScheduleGroupForFullUpdate();
@@ -2863,73 +3015,71 @@ namespace OpenSim.Region.Framework.Scenes
2863 float y = (scale.Y / part.Scale.Y); 3015 float y = (scale.Y / part.Scale.Y);
2864 float z = (scale.Z / part.Scale.Z); 3016 float z = (scale.Z / part.Scale.Z);
2865 3017
2866 lock (m_parts) 3018 lockPartsForRead(true);
3019 if (x > 1.0f || y > 1.0f || z > 1.0f)
2867 { 3020 {
2868 if (x > 1.0f || y > 1.0f || z > 1.0f) 3021 foreach (SceneObjectPart obPart in m_parts.Values)
2869 { 3022 {
2870 foreach (SceneObjectPart obPart in m_parts.Values) 3023 if (obPart.UUID != m_rootPart.UUID)
2871 { 3024 {
2872 if (obPart.UUID != m_rootPart.UUID) 3025 Vector3 oldSize = new Vector3(obPart.Scale);
2873 { 3026 obPart.IgnoreUndoUpdate = true;
2874 obPart.IgnoreUndoUpdate = true;
2875 Vector3 oldSize = new Vector3(obPart.Scale);
2876 3027
2877 float f = 1.0f; 3028 float f = 1.0f;
2878 float a = 1.0f; 3029 float a = 1.0f;
2879 3030
2880 if (part.PhysActor != null && part.PhysActor.IsPhysical) 3031 if (part.PhysActor != null && part.PhysActor.IsPhysical)
3032 {
3033 if (oldSize.X*x > m_scene.m_maxPhys)
2881 { 3034 {
2882 if (oldSize.X*x > m_scene.m_maxPhys) 3035 f = m_scene.m_maxPhys / oldSize.X;
2883 { 3036 a = f / x;
2884 f = m_scene.m_maxPhys / oldSize.X; 3037 x *= a;
2885 a = f / x; 3038 y *= a;
2886 x *= a; 3039 z *= a;
2887 y *= a;
2888 z *= a;
2889 }
2890 if (oldSize.Y*y > m_scene.m_maxPhys)
2891 {
2892 f = m_scene.m_maxPhys / oldSize.Y;
2893 a = f / y;
2894 x *= a;
2895 y *= a;
2896 z *= a;
2897 }
2898 if (oldSize.Z*z > m_scene.m_maxPhys)
2899 {
2900 f = m_scene.m_maxPhys / oldSize.Z;
2901 a = f / z;
2902 x *= a;
2903 y *= a;
2904 z *= a;
2905 }
2906 } 3040 }
2907 else 3041 if (oldSize.Y*y > m_scene.m_maxPhys)
3042 {
3043 f = m_scene.m_maxPhys / oldSize.Y;
3044 a = f / y;
3045 x *= a;
3046 y *= a;
3047 z *= a;
3048 }
3049 if (oldSize.Z*z > m_scene.m_maxPhys)
3050 {
3051 f = m_scene.m_maxPhys / oldSize.Z;
3052 a = f / z;
3053 x *= a;
3054 y *= a;
3055 z *= a;
3056 }
3057 }
3058 else
3059 {
3060 if (oldSize.X*x > m_scene.m_maxNonphys)
3061 {
3062 f = m_scene.m_maxNonphys / oldSize.X;
3063 a = f / x;
3064 x *= a;
3065 y *= a;
3066 z *= a;
3067 }
3068 if (oldSize.Y*y > m_scene.m_maxNonphys)
3069 {
3070 f = m_scene.m_maxNonphys / oldSize.Y;
3071 a = f / y;
3072 x *= a;
3073 y *= a;
3074 z *= a;
3075 }
3076 if (oldSize.Z*z > m_scene.m_maxNonphys)
2908 { 3077 {
2909 if (oldSize.X*x > m_scene.m_maxNonphys) 3078 f = m_scene.m_maxNonphys / oldSize.Z;
2910 { 3079 a = f / z;
2911 f = m_scene.m_maxNonphys / oldSize.X; 3080 x *= a;
2912 a = f / x; 3081 y *= a;
2913 x *= a; 3082 z *= a;
2914 y *= a;
2915 z *= a;
2916 }
2917 if (oldSize.Y*y > m_scene.m_maxNonphys)
2918 {
2919 f = m_scene.m_maxNonphys / oldSize.Y;
2920 a = f / y;
2921 x *= a;
2922 y *= a;
2923 z *= a;
2924 }
2925 if (oldSize.Z*z > m_scene.m_maxNonphys)
2926 {
2927 f = m_scene.m_maxNonphys / oldSize.Z;
2928 a = f / z;
2929 x *= a;
2930 y *= a;
2931 z *= a;
2932 }
2933 } 3083 }
2934 obPart.IgnoreUndoUpdate = false; 3084 obPart.IgnoreUndoUpdate = false;
2935 obPart.StoreUndoState(); 3085 obPart.StoreUndoState();
@@ -2937,6 +3087,7 @@ namespace OpenSim.Region.Framework.Scenes
2937 } 3087 }
2938 } 3088 }
2939 } 3089 }
3090 lockPartsForRead(false);
2940 3091
2941 Vector3 prevScale = part.Scale; 3092 Vector3 prevScale = part.Scale;
2942 prevScale.X *= x; 3093 prevScale.X *= x;
@@ -2944,7 +3095,7 @@ namespace OpenSim.Region.Framework.Scenes
2944 prevScale.Z *= z; 3095 prevScale.Z *= z;
2945 part.Resize(prevScale); 3096 part.Resize(prevScale);
2946 3097
2947 lock (m_parts) 3098 lockPartsForRead(true);
2948 { 3099 {
2949 foreach (SceneObjectPart obPart in m_parts.Values) 3100 foreach (SceneObjectPart obPart in m_parts.Values)
2950 { 3101 {
@@ -2966,6 +3117,7 @@ namespace OpenSim.Region.Framework.Scenes
2966 obPart.StoreUndoState(); 3117 obPart.StoreUndoState();
2967 } 3118 }
2968 } 3119 }
3120 lockPartsForRead(false);
2969 3121
2970 if (part.PhysActor != null) 3122 if (part.PhysActor != null)
2971 { 3123 {
@@ -3068,7 +3220,7 @@ namespace OpenSim.Region.Framework.Scenes
3068 axDiff *= Quaternion.Inverse(partRotation); 3220 axDiff *= Quaternion.Inverse(partRotation);
3069 diff = axDiff; 3221 diff = axDiff;
3070 3222
3071 lock (m_parts) 3223 lockPartsForRead(true);
3072 { 3224 {
3073 foreach (SceneObjectPart obPart in m_parts.Values) 3225 foreach (SceneObjectPart obPart in m_parts.Values)
3074 { 3226 {
@@ -3078,6 +3230,7 @@ namespace OpenSim.Region.Framework.Scenes
3078 } 3230 }
3079 } 3231 }
3080 } 3232 }
3233 lockPartsForRead(false);
3081 3234
3082 AbsolutePosition = newPos; 3235 AbsolutePosition = newPos;
3083 3236
@@ -3211,7 +3364,7 @@ namespace OpenSim.Region.Framework.Scenes
3211 m_scene.PhysicsScene.AddPhysicsActorTaint(m_rootPart.PhysActor); 3364 m_scene.PhysicsScene.AddPhysicsActorTaint(m_rootPart.PhysActor);
3212 } 3365 }
3213 3366
3214 lock (m_parts) 3367 lockPartsForRead(true);
3215 { 3368 {
3216 foreach (SceneObjectPart prim in m_parts.Values) 3369 foreach (SceneObjectPart prim in m_parts.Values)
3217 { 3370 {
@@ -3230,6 +3383,7 @@ namespace OpenSim.Region.Framework.Scenes
3230 } 3383 }
3231 } 3384 }
3232 } 3385 }
3386
3233 foreach (SceneObjectPart childpart in Children.Values) 3387 foreach (SceneObjectPart childpart in Children.Values)
3234 { 3388 {
3235 if (childpart != m_rootPart) 3389 if (childpart != m_rootPart)
@@ -3238,6 +3392,9 @@ namespace OpenSim.Region.Framework.Scenes
3238 childpart.StoreUndoState(); 3392 childpart.StoreUndoState();
3239 } 3393 }
3240 } 3394 }
3395
3396 lockPartsForRead(false);
3397
3241 m_rootPart.ScheduleTerseUpdate(); 3398 m_rootPart.ScheduleTerseUpdate();
3242 } 3399 }
3243 3400
@@ -3359,7 +3516,7 @@ namespace OpenSim.Region.Framework.Scenes
3359 if (atTargets.Count > 0) 3516 if (atTargets.Count > 0)
3360 { 3517 {
3361 uint[] localids = new uint[0]; 3518 uint[] localids = new uint[0];
3362 lock (m_parts) 3519 lockPartsForRead(true);
3363 { 3520 {
3364 localids = new uint[m_parts.Count]; 3521 localids = new uint[m_parts.Count];
3365 int cntr = 0; 3522 int cntr = 0;
@@ -3369,6 +3526,7 @@ namespace OpenSim.Region.Framework.Scenes
3369 cntr++; 3526 cntr++;
3370 } 3527 }
3371 } 3528 }
3529 lockPartsForRead(false);
3372 3530
3373 for (int ctr = 0; ctr < localids.Length; ctr++) 3531 for (int ctr = 0; ctr < localids.Length; ctr++)
3374 { 3532 {
@@ -3387,7 +3545,7 @@ namespace OpenSim.Region.Framework.Scenes
3387 { 3545 {
3388 //trigger not_at_target 3546 //trigger not_at_target
3389 uint[] localids = new uint[0]; 3547 uint[] localids = new uint[0];
3390 lock (m_parts) 3548 lockPartsForRead(true);
3391 { 3549 {
3392 localids = new uint[m_parts.Count]; 3550 localids = new uint[m_parts.Count];
3393 int cntr = 0; 3551 int cntr = 0;
@@ -3397,7 +3555,8 @@ namespace OpenSim.Region.Framework.Scenes
3397 cntr++; 3555 cntr++;
3398 } 3556 }
3399 } 3557 }
3400 3558 lockPartsForRead(false);
3559
3401 for (int ctr = 0; ctr < localids.Length; ctr++) 3560 for (int ctr = 0; ctr < localids.Length; ctr++)
3402 { 3561 {
3403 m_scene.EventManager.TriggerNotAtTargetEvent(localids[ctr]); 3562 m_scene.EventManager.TriggerNotAtTargetEvent(localids[ctr]);
@@ -3489,19 +3648,20 @@ namespace OpenSim.Region.Framework.Scenes
3489 public float GetMass() 3648 public float GetMass()
3490 { 3649 {
3491 float retmass = 0f; 3650 float retmass = 0f;
3492 lock (m_parts) 3651 lockPartsForRead(true);
3493 { 3652 {
3494 foreach (SceneObjectPart part in m_parts.Values) 3653 foreach (SceneObjectPart part in m_parts.Values)
3495 { 3654 {
3496 retmass += part.GetMass(); 3655 retmass += part.GetMass();
3497 } 3656 }
3498 } 3657 }
3658 lockPartsForRead(false);
3499 return retmass; 3659 return retmass;
3500 } 3660 }
3501 3661
3502 public void CheckSculptAndLoad() 3662 public void CheckSculptAndLoad()
3503 { 3663 {
3504 lock (m_parts) 3664 lockPartsForRead(true);
3505 { 3665 {
3506 if (!IsDeleted) 3666 if (!IsDeleted)
3507 { 3667 {
@@ -3526,6 +3686,7 @@ namespace OpenSim.Region.Framework.Scenes
3526 } 3686 }
3527 } 3687 }
3528 } 3688 }
3689 lockPartsForRead(false);
3529 } 3690 }
3530 3691
3531 protected void AssetReceived(string id, Object sender, AssetBase asset) 3692 protected void AssetReceived(string id, Object sender, AssetBase asset)
@@ -3546,7 +3707,7 @@ namespace OpenSim.Region.Framework.Scenes
3546 /// <param name="client"></param> 3707 /// <param name="client"></param>
3547 public void SetGroup(UUID GroupID, IClientAPI client) 3708 public void SetGroup(UUID GroupID, IClientAPI client)
3548 { 3709 {
3549 lock (m_parts) 3710 lockPartsForRead(true);
3550 { 3711 {
3551 foreach (SceneObjectPart part in m_parts.Values) 3712 foreach (SceneObjectPart part in m_parts.Values)
3552 { 3713 {
@@ -3556,7 +3717,7 @@ namespace OpenSim.Region.Framework.Scenes
3556 3717
3557 HasGroupChanged = true; 3718 HasGroupChanged = true;
3558 } 3719 }
3559 3720 lockPartsForRead(false);
3560 ScheduleGroupForFullUpdate(); 3721 ScheduleGroupForFullUpdate();
3561 } 3722 }
3562 3723
@@ -3575,11 +3736,12 @@ namespace OpenSim.Region.Framework.Scenes
3575 3736
3576 public void SetAttachmentPoint(byte point) 3737 public void SetAttachmentPoint(byte point)
3577 { 3738 {
3578 lock (m_parts) 3739 lockPartsForRead(true);
3579 { 3740 {
3580 foreach (SceneObjectPart part in m_parts.Values) 3741 foreach (SceneObjectPart part in m_parts.Values)
3581 part.SetAttachmentPoint(point); 3742 part.SetAttachmentPoint(point);
3582 } 3743 }
3744 lockPartsForRead(false);
3583 } 3745 }
3584 3746
3585 #region ISceneObject 3747 #region ISceneObject
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 5c283bc..57635f5 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -147,7 +147,7 @@ namespace OpenSim.Region.Framework.Scenes
147 147
148 // TODO: This needs to be persisted in next XML version update! 148 // TODO: This needs to be persisted in next XML version update!
149 [XmlIgnore] 149 [XmlIgnore]
150 public readonly int[] PayPrice = {-2,-2,-2,-2,-2}; 150 public int[] PayPrice = {-2,-2,-2,-2,-2};
151 [XmlIgnore] 151 [XmlIgnore]
152 public PhysicsActor PhysActor; 152 public PhysicsActor PhysActor;
153 153
@@ -274,6 +274,7 @@ namespace OpenSim.Region.Framework.Scenes
274 private Quaternion m_sitTargetOrientation = Quaternion.Identity; 274 private Quaternion m_sitTargetOrientation = Quaternion.Identity;
275 private Vector3 m_sitTargetPosition; 275 private Vector3 m_sitTargetPosition;
276 private string m_sitAnimation = "SIT"; 276 private string m_sitAnimation = "SIT";
277 private bool m_occupied; // KF if any av is sitting on this prim
277 private string m_text = String.Empty; 278 private string m_text = String.Empty;
278 private string m_touchName = String.Empty; 279 private string m_touchName = String.Empty;
279 private readonly UndoStack<UndoState> m_undo = new UndoStack<UndoState>(5); 280 private readonly UndoStack<UndoState> m_undo = new UndoStack<UndoState>(5);
@@ -452,12 +453,16 @@ namespace OpenSim.Region.Framework.Scenes
452 } 453 }
453 454
454 /// <value> 455 /// <value>
455 /// Access should be via Inventory directly - this property temporarily remains for xml serialization purposes 456 /// Get the inventory list
456 /// </value> 457 /// </value>
457 public TaskInventoryDictionary TaskInventory 458 public TaskInventoryDictionary TaskInventory
458 { 459 {
459 get { return m_inventory.Items; } 460 get {
460 set { m_inventory.Items = value; } 461 return m_inventory.Items;
462 }
463 set {
464 m_inventory.Items = value;
465 }
461 } 466 }
462 467
463 public uint ObjectFlags 468 public uint ObjectFlags
@@ -586,14 +591,12 @@ namespace OpenSim.Region.Framework.Scenes
586 set { m_LoopSoundSlavePrims = value; } 591 set { m_LoopSoundSlavePrims = value; }
587 } 592 }
588 593
589 [XmlIgnore]
590 public Byte[] TextureAnimation 594 public Byte[] TextureAnimation
591 { 595 {
592 get { return m_TextureAnimation; } 596 get { return m_TextureAnimation; }
593 set { m_TextureAnimation = value; } 597 set { m_TextureAnimation = value; }
594 } 598 }
595 599
596 [XmlIgnore]
597 public Byte[] ParticleSystem 600 public Byte[] ParticleSystem
598 { 601 {
599 get { return m_particleSystem; } 602 get { return m_particleSystem; }
@@ -647,7 +650,6 @@ namespace OpenSim.Region.Framework.Scenes
647 set 650 set
648 { 651 {
649 m_groupPosition = value; 652 m_groupPosition = value;
650
651 PhysicsActor actor = PhysActor; 653 PhysicsActor actor = PhysActor;
652 if (actor != null) 654 if (actor != null)
653 { 655 {
@@ -960,7 +962,8 @@ namespace OpenSim.Region.Framework.Scenes
960 if (IsAttachment) 962 if (IsAttachment)
961 return GroupPosition; 963 return GroupPosition;
962 964
963 return m_offsetPosition + m_groupPosition; } 965// return m_offsetPosition + m_groupPosition; }
966 return m_groupPosition + (m_offsetPosition * ParentGroup.RootPart.RotationOffset) ; } //KF: Rotation was ignored!
964 } 967 }
965 968
966 public SceneObjectGroup ParentGroup 969 public SceneObjectGroup ParentGroup
@@ -1112,6 +1115,13 @@ namespace OpenSim.Region.Framework.Scenes
1112 get { return _flags; } 1115 get { return _flags; }
1113 set { _flags = value; } 1116 set { _flags = value; }
1114 } 1117 }
1118
1119 [XmlIgnore]
1120 public bool IsOccupied // KF If an av is sittingon this prim
1121 {
1122 get { return m_occupied; }
1123 set { m_occupied = value; }
1124 }
1115 1125
1116 [XmlIgnore] 1126 [XmlIgnore]
1117 public UUID SitTargetAvatar 1127 public UUID SitTargetAvatar
@@ -1187,14 +1197,6 @@ namespace OpenSim.Region.Framework.Scenes
1187 } 1197 }
1188 } 1198 }
1189 1199
1190 /// <summary>
1191 /// Clear all pending updates of parts to clients
1192 /// </summary>
1193 private void ClearUpdateSchedule()
1194 {
1195 m_updateFlag = 0;
1196 }
1197
1198 private void SendObjectPropertiesToClient(UUID AgentID) 1200 private void SendObjectPropertiesToClient(UUID AgentID)
1199 { 1201 {
1200 ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences(); 1202 ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences();
@@ -1937,12 +1939,17 @@ namespace OpenSim.Region.Framework.Scenes
1937 public Vector3 GetWorldPosition() 1939 public Vector3 GetWorldPosition()
1938 { 1940 {
1939 Quaternion parentRot = ParentGroup.RootPart.RotationOffset; 1941 Quaternion parentRot = ParentGroup.RootPart.RotationOffset;
1940
1941 Vector3 axPos = OffsetPosition; 1942 Vector3 axPos = OffsetPosition;
1942
1943 axPos *= parentRot; 1943 axPos *= parentRot;
1944 Vector3 translationOffsetPosition = axPos; 1944 Vector3 translationOffsetPosition = axPos;
1945 return GroupPosition + translationOffsetPosition; 1945 if(_parentID == 0)
1946 {
1947 return GroupPosition;
1948 }
1949 else
1950 {
1951 return ParentGroup.AbsolutePosition + translationOffsetPosition; //KF: Fix child prim position
1952 }
1946 } 1953 }
1947 1954
1948 /// <summary> 1955 /// <summary>
@@ -1953,7 +1960,7 @@ namespace OpenSim.Region.Framework.Scenes
1953 { 1960 {
1954 Quaternion newRot; 1961 Quaternion newRot;
1955 1962
1956 if (this.LinkNum == 0) 1963 if (this.LinkNum < 2) //KF Single or root prim
1957 { 1964 {
1958 newRot = RotationOffset; 1965 newRot = RotationOffset;
1959 } 1966 }
@@ -2610,17 +2617,18 @@ namespace OpenSim.Region.Framework.Scenes
2610 //Trys to fetch sound id from prim's inventory. 2617 //Trys to fetch sound id from prim's inventory.
2611 //Prim's inventory doesn't support non script items yet 2618 //Prim's inventory doesn't support non script items yet
2612 2619
2613 lock (TaskInventory) 2620 TaskInventory.LockItemsForRead(true);
2621
2622 foreach (KeyValuePair<UUID, TaskInventoryItem> item in TaskInventory)
2614 { 2623 {
2615 foreach (KeyValuePair<UUID, TaskInventoryItem> item in TaskInventory) 2624 if (item.Value.Name == sound)
2616 { 2625 {
2617 if (item.Value.Name == sound) 2626 soundID = item.Value.ItemID;
2618 { 2627 break;
2619 soundID = item.Value.ItemID;
2620 break;
2621 }
2622 } 2628 }
2623 } 2629 }
2630
2631 TaskInventory.LockItemsForRead(false);
2624 } 2632 }
2625 2633
2626 List<ScenePresence> avatarts = m_parentGroup.Scene.GetAvatars(); 2634 List<ScenePresence> avatarts = m_parentGroup.Scene.GetAvatars();
@@ -2927,8 +2935,8 @@ namespace OpenSim.Region.Framework.Scenes
2927 { 2935 {
2928 const float ROTATION_TOLERANCE = 0.01f; 2936 const float ROTATION_TOLERANCE = 0.01f;
2929 const float VELOCITY_TOLERANCE = 0.001f; 2937 const float VELOCITY_TOLERANCE = 0.001f;
2930 const float POSITION_TOLERANCE = 0.05f; 2938 const float POSITION_TOLERANCE = 0.05f; // I don't like this, but I suppose it's necessary
2931 const int TIME_MS_TOLERANCE = 3000; 2939 const int TIME_MS_TOLERANCE = 200; //llSetPos has a 200ms delay. This should NOT be 3 seconds.
2932 2940
2933 if (m_updateFlag == 1) 2941 if (m_updateFlag == 1)
2934 { 2942 {
@@ -2942,7 +2950,7 @@ namespace OpenSim.Region.Framework.Scenes
2942 Environment.TickCount - m_lastTerseSent > TIME_MS_TOLERANCE) 2950 Environment.TickCount - m_lastTerseSent > TIME_MS_TOLERANCE)
2943 { 2951 {
2944 AddTerseUpdateToAllAvatars(); 2952 AddTerseUpdateToAllAvatars();
2945 ClearUpdateSchedule(); 2953
2946 2954
2947 // This causes the Scene to 'poll' physical objects every couple of frames 2955 // This causes the Scene to 'poll' physical objects every couple of frames
2948 // bad, so it's been replaced by an event driven method. 2956 // bad, so it's been replaced by an event driven method.
@@ -2960,16 +2968,18 @@ namespace OpenSim.Region.Framework.Scenes
2960 m_lastAngularVelocity = AngularVelocity; 2968 m_lastAngularVelocity = AngularVelocity;
2961 m_lastTerseSent = Environment.TickCount; 2969 m_lastTerseSent = Environment.TickCount;
2962 } 2970 }
2971 //Moved this outside of the if clause so updates don't get blocked.. *sigh*
2972 m_updateFlag = 0; //Why were we calling a function to do this? Inefficient! *screams*
2963 } 2973 }
2964 else 2974 else
2965 { 2975 {
2966 if (m_updateFlag == 2) // is a new prim, just created/reloaded or has major changes 2976 if (m_updateFlag == 2) // is a new prim, just created/reloaded or has major changes
2967 { 2977 {
2968 AddFullUpdateToAllAvatars(); 2978 AddFullUpdateToAllAvatars();
2969 ClearUpdateSchedule(); 2979 m_updateFlag = 0; //Same here
2970 } 2980 }
2971 } 2981 }
2972 ClearUpdateSchedule(); 2982 m_updateFlag = 0;
2973 } 2983 }
2974 2984
2975 /// <summary> 2985 /// <summary>
@@ -2996,17 +3006,16 @@ namespace OpenSim.Region.Framework.Scenes
2996 if (!UUID.TryParse(sound, out soundID)) 3006 if (!UUID.TryParse(sound, out soundID))
2997 { 3007 {
2998 // search sound file from inventory 3008 // search sound file from inventory
2999 lock (TaskInventory) 3009 TaskInventory.LockItemsForRead(true);
3010 foreach (KeyValuePair<UUID, TaskInventoryItem> item in TaskInventory)
3000 { 3011 {
3001 foreach (KeyValuePair<UUID, TaskInventoryItem> item in TaskInventory) 3012 if (item.Value.Name == sound && item.Value.Type == (int)AssetType.Sound)
3002 { 3013 {
3003 if (item.Value.Name == sound && item.Value.Type == (int)AssetType.Sound) 3014 soundID = item.Value.ItemID;
3004 { 3015 break;
3005 soundID = item.Value.ItemID;
3006 break;
3007 }
3008 } 3016 }
3009 } 3017 }
3018 TaskInventory.LockItemsForRead(false);
3010 } 3019 }
3011 3020
3012 if (soundID == UUID.Zero) 3021 if (soundID == UUID.Zero)
@@ -3189,6 +3198,22 @@ namespace OpenSim.Region.Framework.Scenes
3189 PhysActor.VehicleRotationParam(param, rotation); 3198 PhysActor.VehicleRotationParam(param, rotation);
3190 } 3199 }
3191 } 3200 }
3201
3202 public void SetVehicleFlags(int flags)
3203 {
3204 if (PhysActor != null)
3205 {
3206 PhysActor.VehicleFlagsSet(flags);
3207 }
3208 }
3209
3210 public void RemoveVehicleFlags(int flags)
3211 {
3212 if (PhysActor != null)
3213 {
3214 PhysActor.VehicleFlagsRemove(flags);
3215 }
3216 }
3192 3217
3193 /// <summary> 3218 /// <summary>
3194 /// Set the color of prim faces 3219 /// Set the color of prim faces
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 04e3221..013285f 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -81,7 +81,9 @@ namespace OpenSim.Region.Framework.Scenes
81 /// </value> 81 /// </value>
82 protected internal TaskInventoryDictionary Items 82 protected internal TaskInventoryDictionary Items
83 { 83 {
84 get { return m_items; } 84 get {
85 return m_items;
86 }
85 set 87 set
86 { 88 {
87 m_items = value; 89 m_items = value;
@@ -117,22 +119,25 @@ namespace OpenSim.Region.Framework.Scenes
117 /// <param name="linkNum">Link number for the part</param> 119 /// <param name="linkNum">Link number for the part</param>
118 public void ResetInventoryIDs() 120 public void ResetInventoryIDs()
119 { 121 {
120 lock (Items) 122 m_items.LockItemsForWrite(true);
123
124 if (0 == Items.Count)
121 { 125 {
122 if (0 == Items.Count) 126 m_items.LockItemsForWrite(false);
123 return; 127 return;
128 }
124 129
125 HasInventoryChanged = true; 130 HasInventoryChanged = true;
126 m_part.ParentGroup.HasGroupChanged = true; 131 m_part.ParentGroup.HasGroupChanged = true;
127 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values); 132 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
128 Items.Clear(); 133 Items.Clear();
129 134
130 foreach (TaskInventoryItem item in items) 135 foreach (TaskInventoryItem item in items)
131 { 136 {
132 item.ResetIDs(m_part.UUID); 137 item.ResetIDs(m_part.UUID);
133 Items.Add(item.ItemID, item); 138 Items.Add(item.ItemID, item);
134 }
135 } 139 }
140 m_items.LockItemsForWrite(false);
136 } 141 }
137 142
138 /// <summary> 143 /// <summary>
@@ -141,25 +146,25 @@ namespace OpenSim.Region.Framework.Scenes
141 /// <param name="ownerId"></param> 146 /// <param name="ownerId"></param>
142 public void ChangeInventoryOwner(UUID ownerId) 147 public void ChangeInventoryOwner(UUID ownerId)
143 { 148 {
144 lock (Items) 149 m_items.LockItemsForWrite(true);
150 if (0 == Items.Count)
145 { 151 {
146 if (0 == Items.Count) 152 m_items.LockItemsForWrite(false);
147 { 153 return;
148 return; 154 }
149 }
150 155
151 HasInventoryChanged = true; 156 HasInventoryChanged = true;
152 m_part.ParentGroup.HasGroupChanged = true; 157 m_part.ParentGroup.HasGroupChanged = true;
153 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values); 158 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
154 foreach (TaskInventoryItem item in items) 159 foreach (TaskInventoryItem item in items)
160 {
161 if (ownerId != item.OwnerID)
155 { 162 {
156 if (ownerId != item.OwnerID) 163 item.LastOwnerID = item.OwnerID;
157 { 164 item.OwnerID = ownerId;
158 item.LastOwnerID = item.OwnerID;
159 item.OwnerID = ownerId;
160 }
161 } 165 }
162 } 166 }
167 m_items.LockItemsForWrite(false);
163 } 168 }
164 169
165 /// <summary> 170 /// <summary>
@@ -168,24 +173,24 @@ namespace OpenSim.Region.Framework.Scenes
168 /// <param name="groupID"></param> 173 /// <param name="groupID"></param>
169 public void ChangeInventoryGroup(UUID groupID) 174 public void ChangeInventoryGroup(UUID groupID)
170 { 175 {
171 lock (Items) 176 m_items.LockItemsForWrite(true);
177 if (0 == Items.Count)
172 { 178 {
173 if (0 == Items.Count) 179 m_items.LockItemsForWrite(false);
174 { 180 return;
175 return; 181 }
176 }
177 182
178 HasInventoryChanged = true; 183 HasInventoryChanged = true;
179 m_part.ParentGroup.HasGroupChanged = true; 184 m_part.ParentGroup.HasGroupChanged = true;
180 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values); 185 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
181 foreach (TaskInventoryItem item in items) 186 foreach (TaskInventoryItem item in items)
187 {
188 if (groupID != item.GroupID)
182 { 189 {
183 if (groupID != item.GroupID) 190 item.GroupID = groupID;
184 {
185 item.GroupID = groupID;
186 }
187 } 191 }
188 } 192 }
193 m_items.LockItemsForWrite(false);
189 } 194 }
190 195
191 /// <summary> 196 /// <summary>
@@ -193,14 +198,14 @@ namespace OpenSim.Region.Framework.Scenes
193 /// </summary> 198 /// </summary>
194 public void CreateScriptInstances(int startParam, bool postOnRez, string engine, int stateSource) 199 public void CreateScriptInstances(int startParam, bool postOnRez, string engine, int stateSource)
195 { 200 {
196 lock (m_items) 201 Items.LockItemsForRead(true);
202 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
203 Items.LockItemsForRead(false);
204 foreach (TaskInventoryItem item in items)
197 { 205 {
198 foreach (TaskInventoryItem item in Items.Values) 206 if ((int)InventoryType.LSL == item.InvType)
199 { 207 {
200 if ((int)InventoryType.LSL == item.InvType) 208 CreateScriptInstance(item, startParam, postOnRez, engine, stateSource);
201 {
202 CreateScriptInstance(item, startParam, postOnRez, engine, stateSource);
203 }
204 } 209 }
205 } 210 }
206 } 211 }
@@ -235,16 +240,20 @@ namespace OpenSim.Region.Framework.Scenes
235 /// </param> 240 /// </param>
236 public void RemoveScriptInstances(bool sceneObjectBeingDeleted) 241 public void RemoveScriptInstances(bool sceneObjectBeingDeleted)
237 { 242 {
238 lock (Items) 243 Items.LockItemsForRead(true);
244 IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
245 Items.LockItemsForRead(false);
246
247 foreach (TaskInventoryItem item in items)
239 { 248 {
240 foreach (TaskInventoryItem item in Items.Values) 249 if ((int)InventoryType.LSL == item.InvType)
241 { 250 {
242 if ((int)InventoryType.LSL == item.InvType) 251 RemoveScriptInstance(item.ItemID, sceneObjectBeingDeleted);
243 { 252 m_part.RemoveScriptEvents(item.ItemID);
244 RemoveScriptInstance(item.ItemID, sceneObjectBeingDeleted);
245 }
246 } 253 }
247 } 254 }
255
256
248 } 257 }
249 258
250 /// <summary> 259 /// <summary>
@@ -269,12 +278,10 @@ namespace OpenSim.Region.Framework.Scenes
269 if (stateSource == 1 && // Prim crossing 278 if (stateSource == 1 && // Prim crossing
270 m_part.ParentGroup.Scene.m_trustBinaries) 279 m_part.ParentGroup.Scene.m_trustBinaries)
271 { 280 {
272 lock (m_items) 281 m_items.LockItemsForWrite(true);
273 { 282 m_items[item.ItemID].PermsMask = 0;
274 m_items[item.ItemID].PermsMask = 0; 283 m_items[item.ItemID].PermsGranter = UUID.Zero;
275 m_items[item.ItemID].PermsGranter = UUID.Zero; 284 m_items.LockItemsForWrite(false);
276 }
277
278 m_part.ParentGroup.Scene.EventManager.TriggerRezScript( 285 m_part.ParentGroup.Scene.EventManager.TriggerRezScript(
279 m_part.LocalId, item.ItemID, String.Empty, startParam, postOnRez, engine, stateSource); 286 m_part.LocalId, item.ItemID, String.Empty, startParam, postOnRez, engine, stateSource);
280 m_part.ParentGroup.AddActiveScriptCount(1); 287 m_part.ParentGroup.AddActiveScriptCount(1);
@@ -282,36 +289,31 @@ namespace OpenSim.Region.Framework.Scenes
282 return; 289 return;
283 } 290 }
284 291
285 m_part.ParentGroup.Scene.AssetService.Get( 292 m_part.ParentGroup.Scene.AssetService.Get(item.AssetID.ToString(), this, delegate(string id, object sender, AssetBase asset)
286 item.AssetID.ToString(), this, delegate(string id, object sender, AssetBase asset) 293 {
287 { 294 if (null == asset)
288 if (null == asset) 295 {
289 { 296 m_log.ErrorFormat(
290 m_log.ErrorFormat( 297 "[PRIM INVENTORY]: " +
291 "[PRIM INVENTORY]: " + 298 "Couldn't start script {0}, {1} at {2} in {3} since asset ID {4} could not be found",
292 "Couldn't start script {0}, {1} at {2} in {3} since asset ID {4} could not be found", 299 item.Name, item.ItemID, m_part.AbsolutePosition,
293 item.Name, item.ItemID, m_part.AbsolutePosition, 300 m_part.ParentGroup.Scene.RegionInfo.RegionName, item.AssetID);
294 m_part.ParentGroup.Scene.RegionInfo.RegionName, item.AssetID); 301 }
295 } 302 else
296 else 303 {
297 { 304 if (m_part.ParentGroup.m_savedScriptState != null)
298 if (m_part.ParentGroup.m_savedScriptState != null) 305 RestoreSavedScriptState(item.OldItemID, item.ItemID);
299 RestoreSavedScriptState(item.OldItemID, item.ItemID); 306 m_items.LockItemsForWrite(true);
300 307 m_items[item.ItemID].PermsMask = 0;
301 lock (m_items) 308 m_items[item.ItemID].PermsGranter = UUID.Zero;
302 { 309 m_items.LockItemsForWrite(false);
303 m_items[item.ItemID].PermsMask = 0; 310 string script = Utils.BytesToString(asset.Data);
304 m_items[item.ItemID].PermsGranter = UUID.Zero; 311 m_part.ParentGroup.Scene.EventManager.TriggerRezScript(
305 } 312 m_part.LocalId, item.ItemID, script, startParam, postOnRez, engine, stateSource);
306 313 m_part.ParentGroup.AddActiveScriptCount(1);
307 string script = Utils.BytesToString(asset.Data); 314 m_part.ScheduleFullUpdate();
308 m_part.ParentGroup.Scene.EventManager.TriggerRezScript( 315 }
309 m_part.LocalId, item.ItemID, script, startParam, postOnRez, engine, stateSource); 316 });
310 m_part.ParentGroup.AddActiveScriptCount(1);
311 m_part.ScheduleFullUpdate();
312 }
313 }
314 );
315 } 317 }
316 } 318 }
317 319
@@ -378,14 +380,17 @@ namespace OpenSim.Region.Framework.Scenes
378 /// </param> 380 /// </param>
379 public void CreateScriptInstance(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource) 381 public void CreateScriptInstance(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource)
380 { 382 {
381 lock (m_items) 383 m_items.LockItemsForRead(true);
384 if (m_items.ContainsKey(itemId))
382 { 385 {
383 if (m_items.ContainsKey(itemId)) 386 if (m_items.ContainsKey(itemId))
384 { 387 {
388 m_items.LockItemsForRead(false);
385 CreateScriptInstance(m_items[itemId], startParam, postOnRez, engine, stateSource); 389 CreateScriptInstance(m_items[itemId], startParam, postOnRez, engine, stateSource);
386 } 390 }
387 else 391 else
388 { 392 {
393 m_items.LockItemsForRead(false);
389 m_log.ErrorFormat( 394 m_log.ErrorFormat(
390 "[PRIM INVENTORY]: " + 395 "[PRIM INVENTORY]: " +
391 "Couldn't start script with ID {0} since it couldn't be found for prim {1}, {2} at {3} in {4}", 396 "Couldn't start script with ID {0} since it couldn't be found for prim {1}, {2} at {3} in {4}",
@@ -393,6 +398,15 @@ namespace OpenSim.Region.Framework.Scenes
393 m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName); 398 m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName);
394 } 399 }
395 } 400 }
401 else
402 {
403 m_items.LockItemsForRead(false);
404 m_log.ErrorFormat(
405 "[PRIM INVENTORY]: " +
406 "Couldn't start script with ID {0} since it couldn't be found for prim {1}, {2}",
407 itemId, m_part.Name, m_part.UUID);
408 }
409
396 } 410 }
397 411
398 /// <summary> 412 /// <summary>
@@ -405,15 +419,7 @@ namespace OpenSim.Region.Framework.Scenes
405 /// </param> 419 /// </param>
406 public void RemoveScriptInstance(UUID itemId, bool sceneObjectBeingDeleted) 420 public void RemoveScriptInstance(UUID itemId, bool sceneObjectBeingDeleted)
407 { 421 {
408 bool scriptPresent = false; 422 if (m_items.ContainsKey(itemId))
409
410 lock (m_items)
411 {
412 if (m_items.ContainsKey(itemId))
413 scriptPresent = true;
414 }
415
416 if (scriptPresent)
417 { 423 {
418 if (!sceneObjectBeingDeleted) 424 if (!sceneObjectBeingDeleted)
419 m_part.RemoveScriptEvents(itemId); 425 m_part.RemoveScriptEvents(itemId);
@@ -439,11 +445,16 @@ namespace OpenSim.Region.Framework.Scenes
439 /// <returns></returns> 445 /// <returns></returns>
440 private bool InventoryContainsName(string name) 446 private bool InventoryContainsName(string name)
441 { 447 {
442 foreach (TaskInventoryItem item in Items.Values) 448 m_items.LockItemsForRead(true);
449 foreach (TaskInventoryItem item in m_items.Values)
443 { 450 {
444 if (item.Name == name) 451 if (item.Name == name)
452 {
453 m_items.LockItemsForRead(false);
445 return true; 454 return true;
455 }
446 } 456 }
457 m_items.LockItemsForRead(false);
447 return false; 458 return false;
448 } 459 }
449 460
@@ -485,13 +496,9 @@ namespace OpenSim.Region.Framework.Scenes
485 /// <param name="item"></param> 496 /// <param name="item"></param>
486 public void AddInventoryItemExclusive(TaskInventoryItem item, bool allowedDrop) 497 public void AddInventoryItemExclusive(TaskInventoryItem item, bool allowedDrop)
487 { 498 {
488 List<TaskInventoryItem> il; 499 m_items.LockItemsForRead(true);
489 500 List<TaskInventoryItem> il = new List<TaskInventoryItem>(m_items.Values);
490 lock (m_items) 501 m_items.LockItemsForRead(false);
491 {
492 il = new List<TaskInventoryItem>(m_items.Values);
493 }
494
495 foreach (TaskInventoryItem i in il) 502 foreach (TaskInventoryItem i in il)
496 { 503 {
497 if (i.Name == item.Name) 504 if (i.Name == item.Name)
@@ -528,15 +535,14 @@ namespace OpenSim.Region.Framework.Scenes
528 item.ParentPartID = m_part.UUID; 535 item.ParentPartID = m_part.UUID;
529 item.Name = name; 536 item.Name = name;
530 537
531 lock (m_items) 538 m_items.LockItemsForWrite(true);
532 { 539 m_items.Add(item.ItemID, item);
533 m_items.Add(item.ItemID, item); 540 m_items.LockItemsForWrite(false);
534
535 if (allowedDrop) 541 if (allowedDrop)
536 m_part.TriggerScriptChangedEvent(Changed.ALLOWED_DROP); 542 m_part.TriggerScriptChangedEvent(Changed.ALLOWED_DROP);
537 else 543 else
538 m_part.TriggerScriptChangedEvent(Changed.INVENTORY); 544 m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
539 } 545
540 546
541 m_inventorySerial++; 547 m_inventorySerial++;
542 //m_inventorySerial += 2; 548 //m_inventorySerial += 2;
@@ -553,14 +559,13 @@ namespace OpenSim.Region.Framework.Scenes
553 /// <param name="items"></param> 559 /// <param name="items"></param>
554 public void RestoreInventoryItems(ICollection<TaskInventoryItem> items) 560 public void RestoreInventoryItems(ICollection<TaskInventoryItem> items)
555 { 561 {
556 lock (m_items) 562 m_items.LockItemsForWrite(true);
563 foreach (TaskInventoryItem item in items)
557 { 564 {
558 foreach (TaskInventoryItem item in items) 565 m_items.Add(item.ItemID, item);
559 { 566 m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
560 m_items.Add(item.ItemID, item);
561 m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
562 }
563 } 567 }
568 m_items.LockItemsForWrite(false);
564 569
565 m_inventorySerial++; 570 m_inventorySerial++;
566 } 571 }
@@ -573,10 +578,9 @@ namespace OpenSim.Region.Framework.Scenes
573 public TaskInventoryItem GetInventoryItem(UUID itemId) 578 public TaskInventoryItem GetInventoryItem(UUID itemId)
574 { 579 {
575 TaskInventoryItem item; 580 TaskInventoryItem item;
576 581 m_items.LockItemsForRead(true);
577 lock (m_items) 582 m_items.TryGetValue(itemId, out item);
578 m_items.TryGetValue(itemId, out item); 583 m_items.LockItemsForRead(false);
579
580 return item; 584 return item;
581 } 585 }
582 586
@@ -612,46 +616,46 @@ namespace OpenSim.Region.Framework.Scenes
612 /// <returns>false if the item did not exist, true if the update occurred successfully</returns> 616 /// <returns>false if the item did not exist, true if the update occurred successfully</returns>
613 public bool UpdateInventoryItem(TaskInventoryItem item) 617 public bool UpdateInventoryItem(TaskInventoryItem item)
614 { 618 {
615 lock (m_items) 619 m_items.LockItemsForWrite(true);
620
621 if (m_items.ContainsKey(item.ItemID))
616 { 622 {
617 if (m_items.ContainsKey(item.ItemID)) 623 item.ParentID = m_part.UUID;
624 item.ParentPartID = m_part.UUID;
625 item.Flags = m_items[item.ItemID].Flags;
626 if (item.AssetID == UUID.Zero)
618 { 627 {
619 item.ParentID = m_part.UUID; 628 item.AssetID = m_items[item.ItemID].AssetID;
620 item.ParentPartID = m_part.UUID; 629 }
621 item.Flags = m_items[item.ItemID].Flags; 630 else if ((InventoryType)item.Type == InventoryType.Notecard)
622 if (item.AssetID == UUID.Zero) 631 {
623 { 632 ScenePresence presence = m_part.ParentGroup.Scene.GetScenePresence(item.OwnerID);
624 item.AssetID = m_items[item.ItemID].AssetID;
625 }
626 else if ((InventoryType)item.Type == InventoryType.Notecard)
627 {
628 ScenePresence presence = m_part.ParentGroup.Scene.GetScenePresence(item.OwnerID);
629 633
630 if (presence != null) 634 if (presence != null)
631 { 635 {
632 presence.ControllingClient.SendAgentAlertMessage( 636 presence.ControllingClient.SendAgentAlertMessage(
633 "Notecard saved", false); 637 "Notecard saved", false);
634 }
635 } 638 }
639 }
636 640
637 m_items[item.ItemID] = item; 641 m_items[item.ItemID] = item;
638 m_inventorySerial++; 642 m_inventorySerial++;
639 m_part.TriggerScriptChangedEvent(Changed.INVENTORY); 643 m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
640
641 HasInventoryChanged = true;
642 m_part.ParentGroup.HasGroupChanged = true;
643 644
644 return true; 645 HasInventoryChanged = true;
645 } 646 m_part.ParentGroup.HasGroupChanged = true;
646 else 647 m_items.LockItemsForWrite(false);
647 { 648 return true;
648 m_log.ErrorFormat( 649 }
649 "[PRIM INVENTORY]: " + 650 else
650 "Tried to retrieve item ID {0} from prim {1}, {2} at {3} in {4} but the item does not exist in this inventory", 651 {
651 item.ItemID, m_part.Name, m_part.UUID, 652 m_log.ErrorFormat(
652 m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName); 653 "[PRIM INVENTORY]: " +
653 } 654 "Tried to retrieve item ID {0} from prim {1}, {2} at {3} in {4} but the item does not exist in this inventory",
655 item.ItemID, m_part.Name, m_part.UUID,
656 m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName);
654 } 657 }
658 m_items.LockItemsForWrite(false);
655 659
656 return false; 660 return false;
657 } 661 }
@@ -664,53 +668,54 @@ namespace OpenSim.Region.Framework.Scenes
664 /// in this prim's inventory.</returns> 668 /// in this prim's inventory.</returns>
665 public int RemoveInventoryItem(UUID itemID) 669 public int RemoveInventoryItem(UUID itemID)
666 { 670 {
667 lock (m_items) 671 m_items.LockItemsForRead(true);
672
673 if (m_items.ContainsKey(itemID))
668 { 674 {
669 if (m_items.ContainsKey(itemID)) 675 int type = m_items[itemID].InvType;
676 m_items.LockItemsForRead(false);
677 if (type == 10) // Script
670 { 678 {
671 int type = m_items[itemID].InvType; 679 m_part.ParentGroup.Scene.EventManager.TriggerRemoveScript(m_part.LocalId, itemID);
672 if (type == 10) // Script 680 }
673 { 681 m_items.LockItemsForWrite(true);
674 m_part.RemoveScriptEvents(itemID); 682 m_items.Remove(itemID);
675 m_part.ParentGroup.Scene.EventManager.TriggerRemoveScript(m_part.LocalId, itemID); 683 m_items.LockItemsForWrite(false);
676 } 684 m_inventorySerial++;
677 m_items.Remove(itemID); 685 m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
678 m_inventorySerial++;
679 m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
680
681 HasInventoryChanged = true;
682 m_part.ParentGroup.HasGroupChanged = true;
683 686
684 int scriptcount = 0; 687 HasInventoryChanged = true;
685 lock (m_items) 688 m_part.ParentGroup.HasGroupChanged = true;
686 {
687 foreach (TaskInventoryItem item in m_items.Values)
688 {
689 if (item.Type == 10)
690 {
691 scriptcount++;
692 }
693 }
694 }
695 689
696 if (scriptcount <= 0) 690 int scriptcount = 0;
691 m_items.LockItemsForRead(true);
692 foreach (TaskInventoryItem item in m_items.Values)
693 {
694 if (item.Type == 10)
697 { 695 {
698 m_part.RemFlag(PrimFlags.Scripted); 696 scriptcount++;
699 } 697 }
700
701 m_part.ScheduleFullUpdate();
702
703 return type;
704 } 698 }
705 else 699 m_items.LockItemsForRead(false);
700
701
702 if (scriptcount <= 0)
706 { 703 {
707 m_log.ErrorFormat( 704 m_part.RemFlag(PrimFlags.Scripted);
708 "[PRIM INVENTORY]: " +
709 "Tried to remove item ID {0} from prim {1}, {2} at {3} in {4} but the item does not exist in this inventory",
710 itemID, m_part.Name, m_part.UUID,
711 m_part.AbsolutePosition, m_part.ParentGroup.Scene.RegionInfo.RegionName);
712 } 705 }
706
707 m_part.ScheduleFullUpdate();
708
709 return type;
710 }
711 else
712 {
713 m_log.ErrorFormat(
714 "[PRIM INVENTORY]: " +
715 "Tried to remove item ID {0} from prim {1}, {2} but the item does not exist in this inventory",
716 itemID, m_part.Name, m_part.UUID);
713 } 717 }
718 m_items.LockItemsForWrite(false);
714 719
715 return -1; 720 return -1;
716 } 721 }
@@ -763,52 +768,53 @@ namespace OpenSim.Region.Framework.Scenes
763 // isn't available (such as drag from prim inventory to agent inventory) 768 // isn't available (such as drag from prim inventory to agent inventory)
764 InventoryStringBuilder invString = new InventoryStringBuilder(m_part.UUID, UUID.Zero); 769 InventoryStringBuilder invString = new InventoryStringBuilder(m_part.UUID, UUID.Zero);
765 770
766 lock (m_items) 771 m_items.LockItemsForRead(true);
772
773 foreach (TaskInventoryItem item in m_items.Values)
767 { 774 {
768 foreach (TaskInventoryItem item in m_items.Values) 775 UUID ownerID = item.OwnerID;
769 { 776 uint everyoneMask = 0;
770 UUID ownerID = item.OwnerID; 777 uint baseMask = item.BasePermissions;
771 uint everyoneMask = 0; 778 uint ownerMask = item.CurrentPermissions;
772 uint baseMask = item.BasePermissions;
773 uint ownerMask = item.CurrentPermissions;
774 779
775 invString.AddItemStart(); 780 invString.AddItemStart();
776 invString.AddNameValueLine("item_id", item.ItemID.ToString()); 781 invString.AddNameValueLine("item_id", item.ItemID.ToString());
777 invString.AddNameValueLine("parent_id", m_part.UUID.ToString()); 782 invString.AddNameValueLine("parent_id", m_part.UUID.ToString());
778 783
779 invString.AddPermissionsStart(); 784 invString.AddPermissionsStart();
780 785
781 invString.AddNameValueLine("base_mask", Utils.UIntToHexString(baseMask)); 786 invString.AddNameValueLine("base_mask", Utils.UIntToHexString(baseMask));
782 invString.AddNameValueLine("owner_mask", Utils.UIntToHexString(ownerMask)); 787 invString.AddNameValueLine("owner_mask", Utils.UIntToHexString(ownerMask));
783 invString.AddNameValueLine("group_mask", Utils.UIntToHexString(0)); 788 invString.AddNameValueLine("group_mask", Utils.UIntToHexString(0));
784 invString.AddNameValueLine("everyone_mask", Utils.UIntToHexString(everyoneMask)); 789 invString.AddNameValueLine("everyone_mask", Utils.UIntToHexString(everyoneMask));
785 invString.AddNameValueLine("next_owner_mask", Utils.UIntToHexString(item.NextPermissions)); 790 invString.AddNameValueLine("next_owner_mask", Utils.UIntToHexString(item.NextPermissions));
786 791
787 invString.AddNameValueLine("creator_id", item.CreatorID.ToString()); 792 invString.AddNameValueLine("creator_id", item.CreatorID.ToString());
788 invString.AddNameValueLine("owner_id", ownerID.ToString()); 793 invString.AddNameValueLine("owner_id", ownerID.ToString());
789 794
790 invString.AddNameValueLine("last_owner_id", item.LastOwnerID.ToString()); 795 invString.AddNameValueLine("last_owner_id", item.LastOwnerID.ToString());
791 796
792 invString.AddNameValueLine("group_id", item.GroupID.ToString()); 797 invString.AddNameValueLine("group_id", item.GroupID.ToString());
793 invString.AddSectionEnd(); 798 invString.AddSectionEnd();
794 799
795 invString.AddNameValueLine("asset_id", item.AssetID.ToString()); 800 invString.AddNameValueLine("asset_id", item.AssetID.ToString());
796 invString.AddNameValueLine("type", TaskInventoryItem.Types[item.Type]); 801 invString.AddNameValueLine("type", TaskInventoryItem.Types[item.Type]);
797 invString.AddNameValueLine("inv_type", TaskInventoryItem.InvTypes[item.InvType]); 802 invString.AddNameValueLine("inv_type", TaskInventoryItem.InvTypes[item.InvType]);
798 invString.AddNameValueLine("flags", Utils.UIntToHexString(item.Flags)); 803 invString.AddNameValueLine("flags", Utils.UIntToHexString(item.Flags));
799 804
800 invString.AddSaleStart(); 805 invString.AddSaleStart();
801 invString.AddNameValueLine("sale_type", "not"); 806 invString.AddNameValueLine("sale_type", "not");
802 invString.AddNameValueLine("sale_price", "0"); 807 invString.AddNameValueLine("sale_price", "0");
803 invString.AddSectionEnd(); 808 invString.AddSectionEnd();
804 809
805 invString.AddNameValueLine("name", item.Name + "|"); 810 invString.AddNameValueLine("name", item.Name + "|");
806 invString.AddNameValueLine("desc", item.Description + "|"); 811 invString.AddNameValueLine("desc", item.Description + "|");
807 812
808 invString.AddNameValueLine("creation_date", item.CreationDate.ToString()); 813 invString.AddNameValueLine("creation_date", item.CreationDate.ToString());
809 invString.AddSectionEnd(); 814 invString.AddSectionEnd();
810 }
811 } 815 }
816 int count = m_items.Count;
817 m_items.LockItemsForRead(false);
812 818
813 fileData = Utils.StringToBytes(invString.BuildString); 819 fileData = Utils.StringToBytes(invString.BuildString);
814 820
@@ -829,10 +835,9 @@ namespace OpenSim.Region.Framework.Scenes
829 { 835 {
830 if (HasInventoryChanged) 836 if (HasInventoryChanged)
831 { 837 {
832 lock (Items) 838 Items.LockItemsForRead(true);
833 { 839 datastore.StorePrimInventory(m_part.UUID, Items.Values);
834 datastore.StorePrimInventory(m_part.UUID, Items.Values); 840 Items.LockItemsForRead(false);
835 }
836 841
837 HasInventoryChanged = false; 842 HasInventoryChanged = false;
838 } 843 }
@@ -901,61 +906,54 @@ namespace OpenSim.Region.Framework.Scenes
901 { 906 {
902 uint mask=0x7fffffff; 907 uint mask=0x7fffffff;
903 908
904 lock (m_items) 909 foreach (TaskInventoryItem item in m_items.Values)
905 { 910 {
906 foreach (TaskInventoryItem item in m_items.Values) 911 if (item.InvType != (int)InventoryType.Object)
907 { 912 {
908 if (item.InvType != (int)InventoryType.Object) 913 if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Copy) == 0)
909 { 914 mask &= ~((uint)PermissionMask.Copy >> 13);
910 if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Copy) == 0) 915 if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Transfer) == 0)
911 mask &= ~((uint)PermissionMask.Copy >> 13); 916 mask &= ~((uint)PermissionMask.Transfer >> 13);
912 if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Transfer) == 0) 917 if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Modify) == 0)
913 mask &= ~((uint)PermissionMask.Transfer >> 13); 918 mask &= ~((uint)PermissionMask.Modify >> 13);
914 if ((item.CurrentPermissions & item.NextPermissions & (uint)PermissionMask.Modify) == 0) 919 }
915 mask &= ~((uint)PermissionMask.Modify >> 13); 920 else
916 } 921 {
917 else 922 if ((item.CurrentPermissions & ((uint)PermissionMask.Copy >> 13)) == 0)
918 { 923 mask &= ~((uint)PermissionMask.Copy >> 13);
919 if ((item.CurrentPermissions & ((uint)PermissionMask.Copy >> 13)) == 0) 924 if ((item.CurrentPermissions & ((uint)PermissionMask.Transfer >> 13)) == 0)
920 mask &= ~((uint)PermissionMask.Copy >> 13); 925 mask &= ~((uint)PermissionMask.Transfer >> 13);
921 if ((item.CurrentPermissions & ((uint)PermissionMask.Transfer >> 13)) == 0) 926 if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0)
922 mask &= ~((uint)PermissionMask.Transfer >> 13); 927 mask &= ~((uint)PermissionMask.Modify >> 13);
923 if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0)
924 mask &= ~((uint)PermissionMask.Modify >> 13);
925 }
926
927 if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
928 mask &= ~(uint)PermissionMask.Copy;
929 if ((item.CurrentPermissions & (uint)PermissionMask.Transfer) == 0)
930 mask &= ~(uint)PermissionMask.Transfer;
931 if ((item.CurrentPermissions & (uint)PermissionMask.Modify) == 0)
932 mask &= ~(uint)PermissionMask.Modify;
933 } 928 }
929
930 if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
931 mask &= ~(uint)PermissionMask.Copy;
932 if ((item.CurrentPermissions & (uint)PermissionMask.Transfer) == 0)
933 mask &= ~(uint)PermissionMask.Transfer;
934 if ((item.CurrentPermissions & (uint)PermissionMask.Modify) == 0)
935 mask &= ~(uint)PermissionMask.Modify;
934 } 936 }
935
936 return mask; 937 return mask;
937 } 938 }
938 939
939 public void ApplyNextOwnerPermissions() 940 public void ApplyNextOwnerPermissions()
940 { 941 {
941 lock (m_items) 942 foreach (TaskInventoryItem item in m_items.Values)
942 { 943 {
943 foreach (TaskInventoryItem item in m_items.Values) 944 if (item.InvType == (int)InventoryType.Object && (item.CurrentPermissions & 7) != 0)
944 { 945 {
945 if (item.InvType == (int)InventoryType.Object && (item.CurrentPermissions & 7) != 0) 946 if ((item.CurrentPermissions & ((uint)PermissionMask.Copy >> 13)) == 0)
946 { 947 item.CurrentPermissions &= ~(uint)PermissionMask.Copy;
947 if ((item.CurrentPermissions & ((uint)PermissionMask.Copy >> 13)) == 0) 948 if ((item.CurrentPermissions & ((uint)PermissionMask.Transfer >> 13)) == 0)
948 item.CurrentPermissions &= ~(uint)PermissionMask.Copy; 949 item.CurrentPermissions &= ~(uint)PermissionMask.Transfer;
949 if ((item.CurrentPermissions & ((uint)PermissionMask.Transfer >> 13)) == 0) 950 if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0)
950 item.CurrentPermissions &= ~(uint)PermissionMask.Transfer; 951 item.CurrentPermissions &= ~(uint)PermissionMask.Modify;
951 if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0) 952 item.CurrentPermissions |= 8;
952 item.CurrentPermissions &= ~(uint)PermissionMask.Modify;
953 item.CurrentPermissions |= 8;
954 }
955 item.CurrentPermissions &= item.NextPermissions;
956 item.BasePermissions &= item.NextPermissions;
957 item.EveryonePermissions &= item.NextPermissions;
958 } 953 }
954 item.CurrentPermissions &= item.NextPermissions;
955 item.BasePermissions &= item.NextPermissions;
956 item.EveryonePermissions &= item.NextPermissions;
959 } 957 }
960 958
961 m_part.TriggerScriptChangedEvent(Changed.OWNER); 959 m_part.TriggerScriptChangedEvent(Changed.OWNER);
@@ -963,29 +961,22 @@ namespace OpenSim.Region.Framework.Scenes
963 961
964 public void ApplyGodPermissions(uint perms) 962 public void ApplyGodPermissions(uint perms)
965 { 963 {
966 lock (m_items) 964 foreach (TaskInventoryItem item in m_items.Values)
967 { 965 {
968 foreach (TaskInventoryItem item in m_items.Values) 966 item.CurrentPermissions = perms;
969 { 967 item.BasePermissions = perms;
970 item.CurrentPermissions = perms;
971 item.BasePermissions = perms;
972 }
973 } 968 }
974 } 969 }
975 970
976 public bool ContainsScripts() 971 public bool ContainsScripts()
977 { 972 {
978 lock (m_items) 973 foreach (TaskInventoryItem item in m_items.Values)
979 { 974 {
980 foreach (TaskInventoryItem item in m_items.Values) 975 if (item.InvType == (int)InventoryType.LSL)
981 { 976 {
982 if (item.InvType == (int)InventoryType.LSL) 977 return true;
983 {
984 return true;
985 }
986 } 978 }
987 } 979 }
988
989 return false; 980 return false;
990 } 981 }
991 982
@@ -993,11 +984,8 @@ namespace OpenSim.Region.Framework.Scenes
993 { 984 {
994 List<UUID> ret = new List<UUID>(); 985 List<UUID> ret = new List<UUID>();
995 986
996 lock (m_items) 987 foreach (TaskInventoryItem item in m_items.Values)
997 { 988 ret.Add(item.ItemID);
998 foreach (TaskInventoryItem item in m_items.Values)
999 ret.Add(item.ItemID);
1000 }
1001 989
1002 return ret; 990 return ret;
1003 } 991 }
@@ -1010,30 +998,26 @@ namespace OpenSim.Region.Framework.Scenes
1010 if (engines == null) // No engine at all 998 if (engines == null) // No engine at all
1011 return ret; 999 return ret;
1012 1000
1013 lock (m_items) 1001 foreach (TaskInventoryItem item in m_items.Values)
1014 { 1002 {
1015 foreach (TaskInventoryItem item in m_items.Values) 1003 if (item.InvType == (int)InventoryType.LSL)
1016 { 1004 {
1017 if (item.InvType == (int)InventoryType.LSL) 1005 foreach (IScriptModule e in engines)
1018 { 1006 {
1019 foreach (IScriptModule e in engines) 1007 if (e != null)
1020 { 1008 {
1021 if (e != null) 1009 string n = e.GetXMLState(item.ItemID);
1010 if (n != String.Empty)
1022 { 1011 {
1023 string n = e.GetXMLState(item.ItemID); 1012 if (!ret.ContainsKey(item.ItemID))
1024 if (n != String.Empty) 1013 ret[item.ItemID] = n;
1025 { 1014 break;
1026 if (!ret.ContainsKey(item.ItemID))
1027 ret[item.ItemID] = n;
1028 break;
1029 }
1030 } 1015 }
1031 } 1016 }
1032 } 1017 }
1033 } 1018 }
1034 } 1019 }
1035
1036 return ret; 1020 return ret;
1037 } 1021 }
1038 } 1022 }
1039} \ No newline at end of file 1023}
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index f83a4d2..453523a 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -73,7 +73,7 @@ namespace OpenSim.Region.Framework.Scenes
73// { 73// {
74// m_log.Debug("[ScenePresence] Destructor called"); 74// m_log.Debug("[ScenePresence] Destructor called");
75// } 75// }
76 76
77 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 77 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
78 78
79 private static readonly byte[] BAKE_INDICES = new byte[] { 8, 9, 10, 11, 19, 20 }; 79 private static readonly byte[] BAKE_INDICES = new byte[] { 8, 9, 10, 11, 19, 20 };
@@ -89,7 +89,9 @@ namespace OpenSim.Region.Framework.Scenes
89 /// rotation, prim cut, prim twist, prim taper, and prim shear. See mantis 89 /// rotation, prim cut, prim twist, prim taper, and prim shear. See mantis
90 /// issue #1716 90 /// issue #1716
91 /// </summary> 91 /// </summary>
92 private static readonly Vector3 SIT_TARGET_ADJUSTMENT = new Vector3(0.1f, 0.0f, 0.3f); 92// private static readonly Vector3 SIT_TARGET_ADJUSTMENT = new Vector3(0.1f, 0.0f, 0.3f);
93 // Value revised by KF 091121 by comparison with SL.
94 private static readonly Vector3 SIT_TARGET_ADJUSTMENT = new Vector3(0.0f, 0.0f, 0.418f);
93 95
94 public UUID currentParcelUUID = UUID.Zero; 96 public UUID currentParcelUUID = UUID.Zero;
95 97
@@ -123,8 +125,11 @@ namespace OpenSim.Region.Framework.Scenes
123 public Vector3 lastKnownAllowedPosition; 125 public Vector3 lastKnownAllowedPosition;
124 public bool sentMessageAboutRestrictedParcelFlyingDown; 126 public bool sentMessageAboutRestrictedParcelFlyingDown;
125 public Vector4 CollisionPlane = Vector4.UnitW; 127 public Vector4 CollisionPlane = Vector4.UnitW;
126 128
127 private Vector3 m_lastPosition; 129 private Vector3 m_avInitialPos; // used to calculate unscripted sit rotation
130 private Vector3 m_avUnscriptedSitPos; // for non-scripted prims
131 private Vector3 m_lastPosition;
132 private Vector3 m_lastWorldPosition;
128 private Quaternion m_lastRotation; 133 private Quaternion m_lastRotation;
129 private Vector3 m_lastVelocity; 134 private Vector3 m_lastVelocity;
130 //private int m_lastTerseSent; 135 //private int m_lastTerseSent;
@@ -134,7 +139,6 @@ namespace OpenSim.Region.Framework.Scenes
134 private Vector3? m_forceToApply; 139 private Vector3? m_forceToApply;
135 private uint m_requestedSitTargetID; 140 private uint m_requestedSitTargetID;
136 private UUID m_requestedSitTargetUUID; 141 private UUID m_requestedSitTargetUUID;
137 public bool SitGround = false;
138 142
139 private SendCourseLocationsMethod m_sendCourseLocationsMethod; 143 private SendCourseLocationsMethod m_sendCourseLocationsMethod;
140 144
@@ -156,7 +160,6 @@ namespace OpenSim.Region.Framework.Scenes
156 private int m_perfMonMS; 160 private int m_perfMonMS;
157 161
158 private bool m_setAlwaysRun; 162 private bool m_setAlwaysRun;
159
160 private bool m_forceFly; 163 private bool m_forceFly;
161 private bool m_flyDisabled; 164 private bool m_flyDisabled;
162 165
@@ -182,7 +185,8 @@ namespace OpenSim.Region.Framework.Scenes
182 protected RegionInfo m_regionInfo; 185 protected RegionInfo m_regionInfo;
183 protected ulong crossingFromRegion; 186 protected ulong crossingFromRegion;
184 187
185 private readonly Vector3[] Dir_Vectors = new Vector3[9]; 188 private readonly Vector3[] Dir_Vectors = new Vector3[11];
189 private bool m_isNudging = false;
186 190
187 // Position of agent's camera in world (region cordinates) 191 // Position of agent's camera in world (region cordinates)
188 protected Vector3 m_CameraCenter; 192 protected Vector3 m_CameraCenter;
@@ -207,6 +211,7 @@ namespace OpenSim.Region.Framework.Scenes
207 private bool m_autopilotMoving; 211 private bool m_autopilotMoving;
208 private Vector3 m_autoPilotTarget; 212 private Vector3 m_autoPilotTarget;
209 private bool m_sitAtAutoTarget; 213 private bool m_sitAtAutoTarget;
214 private Vector3 m_initialSitTarget; //KF: First estimate of where to sit
210 215
211 private string m_nextSitAnimation = String.Empty; 216 private string m_nextSitAnimation = String.Empty;
212 217
@@ -217,6 +222,9 @@ namespace OpenSim.Region.Framework.Scenes
217 private bool m_followCamAuto; 222 private bool m_followCamAuto;
218 223
219 private int m_movementUpdateCount; 224 private int m_movementUpdateCount;
225 private int m_lastColCount = -1; //KF: Look for Collision chnages
226 private int m_updateCount = 0; //KF: Update Anims for a while
227 private static readonly int UPDATE_COUNT = 10; // how many frames to update for
220 228
221 private const int NumMovementsBetweenRayCast = 5; 229 private const int NumMovementsBetweenRayCast = 5;
222 230
@@ -245,7 +253,9 @@ namespace OpenSim.Region.Framework.Scenes
245 DIR_CONTROL_FLAG_UP = AgentManager.ControlFlags.AGENT_CONTROL_UP_POS, 253 DIR_CONTROL_FLAG_UP = AgentManager.ControlFlags.AGENT_CONTROL_UP_POS,
246 DIR_CONTROL_FLAG_DOWN = AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG, 254 DIR_CONTROL_FLAG_DOWN = AgentManager.ControlFlags.AGENT_CONTROL_UP_NEG,
247 DIR_CONTROL_FLAG_FORWARD_NUDGE = AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_POS, 255 DIR_CONTROL_FLAG_FORWARD_NUDGE = AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_POS,
248 DIR_CONTROL_FLAG_BACKWARD_NUDGE = AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_NEG, 256 DIR_CONTROL_FLAG_BACK_NUDGE = AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_AT_NEG,
257 DIR_CONTROL_FLAG_LEFT_NUDGE = AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_LEFT_POS,
258 DIR_CONTROL_FLAG_RIGHT_NUDGE = AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_LEFT_NEG,
249 DIR_CONTROL_FLAG_DOWN_NUDGE = AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_UP_NEG 259 DIR_CONTROL_FLAG_DOWN_NUDGE = AgentManager.ControlFlags.AGENT_CONTROL_NUDGE_UP_NEG
250 } 260 }
251 261
@@ -682,10 +692,7 @@ namespace OpenSim.Region.Framework.Scenes
682 m_reprioritization_timer.AutoReset = false; 692 m_reprioritization_timer.AutoReset = false;
683 693
684 AdjustKnownSeeds(); 694 AdjustKnownSeeds();
685
686 // TODO: I think, this won't send anything, as we are still a child here...
687 Animator.TrySetMovementAnimation("STAND"); 695 Animator.TrySetMovementAnimation("STAND");
688
689 // we created a new ScenePresence (a new child agent) in a fresh region. 696 // we created a new ScenePresence (a new child agent) in a fresh region.
690 // Request info about all the (root) agents in this region 697 // Request info about all the (root) agents in this region
691 // Note: This won't send data *to* other clients in that region (children don't send) 698 // Note: This won't send data *to* other clients in that region (children don't send)
@@ -741,25 +748,47 @@ namespace OpenSim.Region.Framework.Scenes
741 Dir_Vectors[3] = -Vector3.UnitY; //RIGHT 748 Dir_Vectors[3] = -Vector3.UnitY; //RIGHT
742 Dir_Vectors[4] = Vector3.UnitZ; //UP 749 Dir_Vectors[4] = Vector3.UnitZ; //UP
743 Dir_Vectors[5] = -Vector3.UnitZ; //DOWN 750 Dir_Vectors[5] = -Vector3.UnitZ; //DOWN
744 Dir_Vectors[8] = new Vector3(0f, 0f, -0.5f); //DOWN_Nudge 751 Dir_Vectors[6] = new Vector3(0.5f, 0f, 0f); //FORWARD_NUDGE
745 Dir_Vectors[6] = Vector3.UnitX*2; //FORWARD 752 Dir_Vectors[7] = new Vector3(-0.5f, 0f, 0f); //BACK_NUDGE
746 Dir_Vectors[7] = -Vector3.UnitX; //BACK 753 Dir_Vectors[8] = new Vector3(0f, 0.5f, 0f); //LEFT_NUDGE
754 Dir_Vectors[9] = new Vector3(0f, -0.5f, 0f); //RIGHT_NUDGE
755 Dir_Vectors[10] = new Vector3(0f, 0f, -0.5f); //DOWN_Nudge
747 } 756 }
748 757
749 private Vector3[] GetWalkDirectionVectors() 758 private Vector3[] GetWalkDirectionVectors()
750 { 759 {
751 Vector3[] vector = new Vector3[9]; 760 Vector3[] vector = new Vector3[11];
752 vector[0] = new Vector3(m_CameraUpAxis.Z, 0f, -m_CameraAtAxis.Z); //FORWARD 761 vector[0] = new Vector3(m_CameraUpAxis.Z, 0f, -m_CameraAtAxis.Z); //FORWARD
753 vector[1] = new Vector3(-m_CameraUpAxis.Z, 0f, m_CameraAtAxis.Z); //BACK 762 vector[1] = new Vector3(-m_CameraUpAxis.Z, 0f, m_CameraAtAxis.Z); //BACK
754 vector[2] = Vector3.UnitY; //LEFT 763 vector[2] = Vector3.UnitY; //LEFT
755 vector[3] = -Vector3.UnitY; //RIGHT 764 vector[3] = -Vector3.UnitY; //RIGHT
756 vector[4] = new Vector3(m_CameraAtAxis.Z, 0f, m_CameraUpAxis.Z); //UP 765 vector[4] = new Vector3(m_CameraAtAxis.Z, 0f, m_CameraUpAxis.Z); //UP
757 vector[5] = new Vector3(-m_CameraAtAxis.Z, 0f, -m_CameraUpAxis.Z); //DOWN 766 vector[5] = new Vector3(-m_CameraAtAxis.Z, 0f, -m_CameraUpAxis.Z); //DOWN
758 vector[8] = new Vector3(-m_CameraAtAxis.Z, 0f, -m_CameraUpAxis.Z); //DOWN_Nudge 767 vector[6] = new Vector3(m_CameraUpAxis.Z, 0f, -m_CameraAtAxis.Z); //FORWARD_NUDGE
759 vector[6] = (new Vector3(m_CameraUpAxis.Z, 0f, -m_CameraAtAxis.Z) * 2); //FORWARD Nudge 768 vector[7] = new Vector3(-m_CameraUpAxis.Z, 0f, m_CameraAtAxis.Z); //BACK_NUDGE
760 vector[7] = new Vector3(-m_CameraUpAxis.Z, 0f, m_CameraAtAxis.Z); //BACK Nudge 769 vector[8] = Vector3.UnitY; //LEFT_NUDGE
770 vector[9] = -Vector3.UnitY; //RIGHT_NUDGE
771 vector[10] = new Vector3(-m_CameraAtAxis.Z, 0f, -m_CameraUpAxis.Z); //DOWN_NUDGE
761 return vector; 772 return vector;
762 } 773 }
774
775 private bool[] GetDirectionIsNudge()
776 {
777 bool[] isNudge = new bool[11];
778 isNudge[0] = false; //FORWARD
779 isNudge[1] = false; //BACK
780 isNudge[2] = false; //LEFT
781 isNudge[3] = false; //RIGHT
782 isNudge[4] = false; //UP
783 isNudge[5] = false; //DOWN
784 isNudge[6] = true; //FORWARD_NUDGE
785 isNudge[7] = true; //BACK_NUDGE
786 isNudge[8] = true; //LEFT_NUDGE
787 isNudge[9] = true; //RIGHT_NUDGE
788 isNudge[10] = true; //DOWN_Nudge
789 return isNudge;
790 }
791
763 792
764 #endregion 793 #endregion
765 794
@@ -828,9 +857,24 @@ namespace OpenSim.Region.Framework.Scenes
828 { 857 {
829 Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.N); 858 Border crossedBorder = m_scene.GetCrossedBorder(pos, Cardinals.N);
830 pos.Y = crossedBorder.BorderLine.Z - 1; 859 pos.Y = crossedBorder.BorderLine.Z - 1;
860 }
861
862 //If they're TP'ing in or logging in, we haven't had time to add any known child regions yet.
863 //This has the unfortunate consequence that if somebody is TP'ing who is already a child agent,
864 //they'll bypass the landing point. But I can't think of any decent way of fixing this.
865 if (KnownChildRegionHandles.Count == 0)
866 {
867 ILandObject land = m_scene.LandChannel.GetLandObject(pos.X, pos.Y);
868 if (land != null)
869 {
870 //Don't restrict gods, estate managers, or land owners to the TP point. This behaviour mimics agni.
871 if (land.LandData.LandingType == (byte)1 && land.LandData.UserLocation != Vector3.Zero && m_godlevel < 200 && !m_scene.RegionInfo.EstateSettings.IsEstateManager(m_uuid) && land.LandData.OwnerID != m_uuid)
872 {
873 pos = land.LandData.UserLocation;
874 }
875 }
831 } 876 }
832 877
833
834 if (pos.X < 0 || pos.Y < 0 || pos.Z < 0) 878 if (pos.X < 0 || pos.Y < 0 || pos.Z < 0)
835 { 879 {
836 Vector3 emergencyPos = new Vector3(((int)Constants.RegionSize * 0.5f), ((int)Constants.RegionSize * 0.5f), 128); 880 Vector3 emergencyPos = new Vector3(((int)Constants.RegionSize * 0.5f), ((int)Constants.RegionSize * 0.5f), 128);
@@ -990,9 +1034,10 @@ namespace OpenSim.Region.Framework.Scenes
990 public void Teleport(Vector3 pos) 1034 public void Teleport(Vector3 pos)
991 { 1035 {
992 bool isFlying = false; 1036 bool isFlying = false;
993 if (m_physicsActor != null)
994 isFlying = m_physicsActor.Flying;
995 1037
1038 if (m_physicsActor != null)
1039 isFlying = m_physicsActor.Flying;
1040
996 RemoveFromPhysicalScene(); 1041 RemoveFromPhysicalScene();
997 Velocity = Vector3.Zero; 1042 Velocity = Vector3.Zero;
998 AbsolutePosition = pos; 1043 AbsolutePosition = pos;
@@ -1003,7 +1048,8 @@ namespace OpenSim.Region.Framework.Scenes
1003 SetHeight(m_appearance.AvatarHeight); 1048 SetHeight(m_appearance.AvatarHeight);
1004 } 1049 }
1005 1050
1006 SendTerseUpdateToAllClients(); 1051 SendTerseUpdateToAllClients();
1052
1007 } 1053 }
1008 1054
1009 public void TeleportWithMomentum(Vector3 pos) 1055 public void TeleportWithMomentum(Vector3 pos)
@@ -1048,7 +1094,9 @@ namespace OpenSim.Region.Framework.Scenes
1048 { 1094 {
1049 AbsolutePosition = AbsolutePosition + new Vector3(0f, 0f, (1.56f / 6f)); 1095 AbsolutePosition = AbsolutePosition + new Vector3(0f, 0f, (1.56f / 6f));
1050 } 1096 }
1051 1097
1098 m_updateCount = UPDATE_COUNT; //KF: Trigger Anim updates to catch falling anim.
1099
1052 ControllingClient.SendAvatarTerseUpdate(new SendAvatarTerseData(m_rootRegionHandle, (ushort)(m_scene.TimeDilation * ushort.MaxValue), LocalId, 1100 ControllingClient.SendAvatarTerseUpdate(new SendAvatarTerseData(m_rootRegionHandle, (ushort)(m_scene.TimeDilation * ushort.MaxValue), LocalId,
1053 AbsolutePosition, Velocity, Vector3.Zero, m_bodyRot, new Vector4(0,0,1,AbsolutePosition.Z - 0.5f), m_uuid, null, GetUpdatePriority(ControllingClient))); 1101 AbsolutePosition, Velocity, Vector3.Zero, m_bodyRot, new Vector4(0,0,1,AbsolutePosition.Z - 0.5f), m_uuid, null, GetUpdatePriority(ControllingClient)));
1054 } 1102 }
@@ -1299,7 +1347,6 @@ namespace OpenSim.Region.Framework.Scenes
1299 m_scene.PhysicsScene.RaycastWorld(m_pos, Vector3.Normalize(m_CameraCenter - posAdjusted), Vector3.Distance(m_CameraCenter, posAdjusted) + 0.3f, RayCastCameraCallback); 1347 m_scene.PhysicsScene.RaycastWorld(m_pos, Vector3.Normalize(m_CameraCenter - posAdjusted), Vector3.Distance(m_CameraCenter, posAdjusted) + 0.3f, RayCastCameraCallback);
1300 } 1348 }
1301 } 1349 }
1302
1303 lock (scriptedcontrols) 1350 lock (scriptedcontrols)
1304 { 1351 {
1305 if (scriptedcontrols.Count > 0) 1352 if (scriptedcontrols.Count > 0)
@@ -1314,12 +1361,8 @@ namespace OpenSim.Region.Framework.Scenes
1314 1361
1315 if ((flags & AgentManager.ControlFlags.AGENT_CONTROL_SIT_ON_GROUND) != 0) 1362 if ((flags & AgentManager.ControlFlags.AGENT_CONTROL_SIT_ON_GROUND) != 0)
1316 { 1363 {
1317 // TODO: This doesn't prevent the user from walking yet. 1364 m_updateCount = 0; // Kill animation update burst so that the SIT_G.. will stick.
1318 // Setting parent ID would fix this, if we knew what value 1365 Animator.TrySetMovementAnimation("SIT_GROUND_CONSTRAINED");
1319 // to use. Or we could add a m_isSitting variable.
1320 //Animator.TrySetMovementAnimation("SIT_GROUND_CONSTRAINED");
1321 SitGround = true;
1322
1323 } 1366 }
1324 1367
1325 // In the future, these values might need to go global. 1368 // In the future, these values might need to go global.
@@ -1369,6 +1412,11 @@ namespace OpenSim.Region.Framework.Scenes
1369 update_rotation = true; 1412 update_rotation = true;
1370 } 1413 }
1371 1414
1415 //guilty until proven innocent..
1416 bool Nudging = true;
1417 //Basically, if there is at least one non-nudge control then we don't need
1418 //to worry about stopping the avatar
1419
1372 if (m_parentID == 0) 1420 if (m_parentID == 0)
1373 { 1421 {
1374 bool bAllowUpdateMoveToPosition = false; 1422 bool bAllowUpdateMoveToPosition = false;
@@ -1383,9 +1431,12 @@ namespace OpenSim.Region.Framework.Scenes
1383 else 1431 else
1384 dirVectors = Dir_Vectors; 1432 dirVectors = Dir_Vectors;
1385 1433
1386 // The fact that m_movementflag is a byte needs to be fixed 1434 bool[] isNudge = GetDirectionIsNudge();
1387 // it really should be a uint 1435
1388 uint nudgehack = 250; 1436
1437
1438
1439
1389 foreach (Dir_ControlFlags DCF in DIR_CONTROL_FLAGS) 1440 foreach (Dir_ControlFlags DCF in DIR_CONTROL_FLAGS)
1390 { 1441 {
1391 if (((uint)flags & (uint)DCF) != 0) 1442 if (((uint)flags & (uint)DCF) != 0)
@@ -1395,40 +1446,28 @@ namespace OpenSim.Region.Framework.Scenes
1395 try 1446 try
1396 { 1447 {
1397 agent_control_v3 += dirVectors[i]; 1448 agent_control_v3 += dirVectors[i];
1398 //m_log.DebugFormat("[Motion]: {0}, {1}",i, dirVectors[i]); 1449 if (isNudge[i] == false)
1450 {
1451 Nudging = false;
1452 }
1399 } 1453 }
1400 catch (IndexOutOfRangeException) 1454 catch (IndexOutOfRangeException)
1401 { 1455 {
1402 // Why did I get this? 1456 // Why did I get this?
1403 } 1457 }
1404 1458
1405 if ((m_movementflag & (byte)(uint)DCF) == 0) 1459 if ((m_movementflag & (uint)DCF) == 0)
1406 { 1460 {
1407 if (DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_FORWARD_NUDGE || DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_BACKWARD_NUDGE)
1408 {
1409 m_movementflag |= (byte)nudgehack;
1410 }
1411 m_movementflag += (byte)(uint)DCF; 1461 m_movementflag += (byte)(uint)DCF;
1412 update_movementflag = true; 1462 update_movementflag = true;
1413 } 1463 }
1414 } 1464 }
1415 else 1465 else
1416 { 1466 {
1417 if ((m_movementflag & (byte)(uint)DCF) != 0 || 1467 if ((m_movementflag & (uint)DCF) != 0)
1418 ((DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_FORWARD_NUDGE || DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_BACKWARD_NUDGE)
1419 && ((m_movementflag & (byte)nudgehack) == nudgehack))
1420 ) // This or is for Nudge forward
1421 { 1468 {
1422 m_movementflag -= ((byte)(uint)DCF); 1469 m_movementflag -= (byte)(uint)DCF;
1423
1424 update_movementflag = true; 1470 update_movementflag = true;
1425 /*
1426 if ((DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_FORWARD_NUDGE || DCF == Dir_ControlFlags.DIR_CONTROL_FLAG_BACKWARD_NUDGE)
1427 && ((m_movementflag & (byte)nudgehack) == nudgehack))
1428 {
1429 m_log.Debug("Removed Hack flag");
1430 }
1431 */
1432 } 1471 }
1433 else 1472 else
1434 { 1473 {
@@ -1472,6 +1511,9 @@ namespace OpenSim.Region.Framework.Scenes
1472 // Ignore z component of vector 1511 // Ignore z component of vector
1473 Vector3 LocalVectorToTarget2D = new Vector3((float)(LocalVectorToTarget3D.X), (float)(LocalVectorToTarget3D.Y), 0f); 1512 Vector3 LocalVectorToTarget2D = new Vector3((float)(LocalVectorToTarget3D.X), (float)(LocalVectorToTarget3D.Y), 0f);
1474 LocalVectorToTarget2D.Normalize(); 1513 LocalVectorToTarget2D.Normalize();
1514
1515 //We're not nudging
1516 Nudging = false;
1475 agent_control_v3 += LocalVectorToTarget2D; 1517 agent_control_v3 += LocalVectorToTarget2D;
1476 1518
1477 // update avatar movement flags. the avatar coordinate system is as follows: 1519 // update avatar movement flags. the avatar coordinate system is as follows:
@@ -1560,13 +1602,13 @@ namespace OpenSim.Region.Framework.Scenes
1560 // m_log.DebugFormat( 1602 // m_log.DebugFormat(
1561 // "In {0} adding velocity to {1} of {2}", m_scene.RegionInfo.RegionName, Name, agent_control_v3); 1603 // "In {0} adding velocity to {1} of {2}", m_scene.RegionInfo.RegionName, Name, agent_control_v3);
1562 1604
1563 AddNewMovement(agent_control_v3, q); 1605 AddNewMovement(agent_control_v3, q, Nudging);
1564 1606
1565 1607
1566 } 1608 }
1567 } 1609 }
1568 1610
1569 if (update_movementflag && ((flags & AgentManager.ControlFlags.AGENT_CONTROL_SIT_ON_GROUND) == 0) && (m_parentID == 0) && !SitGround) 1611 if (update_movementflag)
1570 Animator.UpdateMovementAnimations(); 1612 Animator.UpdateMovementAnimations();
1571 1613
1572 m_scene.EventManager.TriggerOnClientMovement(this); 1614 m_scene.EventManager.TriggerOnClientMovement(this);
@@ -1581,7 +1623,6 @@ namespace OpenSim.Region.Framework.Scenes
1581 m_sitAtAutoTarget = false; 1623 m_sitAtAutoTarget = false;
1582 PrimitiveBaseShape proxy = PrimitiveBaseShape.Default; 1624 PrimitiveBaseShape proxy = PrimitiveBaseShape.Default;
1583 //proxy.PCode = (byte)PCode.ParticleSystem; 1625 //proxy.PCode = (byte)PCode.ParticleSystem;
1584
1585 proxyObjectGroup = new SceneObjectGroup(UUID, Pos, Rotation, proxy); 1626 proxyObjectGroup = new SceneObjectGroup(UUID, Pos, Rotation, proxy);
1586 proxyObjectGroup.AttachToScene(m_scene); 1627 proxyObjectGroup.AttachToScene(m_scene);
1587 1628
@@ -1623,7 +1664,7 @@ namespace OpenSim.Region.Framework.Scenes
1623 } 1664 }
1624 m_moveToPositionInProgress = true; 1665 m_moveToPositionInProgress = true;
1625 m_moveToPositionTarget = new Vector3(locx, locy, locz); 1666 m_moveToPositionTarget = new Vector3(locx, locy, locz);
1626 } 1667 }
1627 catch (Exception ex) 1668 catch (Exception ex)
1628 { 1669 {
1629 //Why did I get this error? 1670 //Why did I get this error?
@@ -1645,7 +1686,7 @@ namespace OpenSim.Region.Framework.Scenes
1645 Velocity = Vector3.Zero; 1686 Velocity = Vector3.Zero;
1646 SendFullUpdateToAllClients(); 1687 SendFullUpdateToAllClients();
1647 1688
1648 //HandleAgentSit(ControllingClient, m_requestedSitTargetUUID); 1689 HandleAgentSit(ControllingClient, m_requestedSitTargetUUID); //KF ??
1649 } 1690 }
1650 //ControllingClient.SendSitResponse(m_requestedSitTargetID, m_requestedSitOffset, Quaternion.Identity, false, Vector3.Zero, Vector3.Zero, false); 1691 //ControllingClient.SendSitResponse(m_requestedSitTargetID, m_requestedSitOffset, Quaternion.Identity, false, Vector3.Zero, Vector3.Zero, false);
1651 m_requestedSitTargetUUID = UUID.Zero; 1692 m_requestedSitTargetUUID = UUID.Zero;
@@ -1678,55 +1719,84 @@ namespace OpenSim.Region.Framework.Scenes
1678 /// </summary> 1719 /// </summary>
1679 public void StandUp() 1720 public void StandUp()
1680 { 1721 {
1681 if (SitGround)
1682 SitGround = false;
1683
1684 if (m_parentID != 0) 1722 if (m_parentID != 0)
1685 { 1723 {
1686 m_log.Debug("StandupCode Executed");
1687 SceneObjectPart part = m_scene.GetSceneObjectPart(m_parentID); 1724 SceneObjectPart part = m_scene.GetSceneObjectPart(m_parentID);
1688 if (part != null) 1725 if (part != null)
1689 { 1726 {
1727 part.TaskInventory.LockItemsForRead(true);
1690 TaskInventoryDictionary taskIDict = part.TaskInventory; 1728 TaskInventoryDictionary taskIDict = part.TaskInventory;
1691 if (taskIDict != null) 1729 if (taskIDict != null)
1692 { 1730 {
1693 lock (taskIDict) 1731 foreach (UUID taskID in taskIDict.Keys)
1694 { 1732 {
1695 foreach (UUID taskID in taskIDict.Keys) 1733 UnRegisterControlEventsToScript(LocalId, taskID);
1696 { 1734 taskIDict[taskID].PermsMask &= ~(
1697 UnRegisterControlEventsToScript(LocalId, taskID); 1735 2048 | //PERMISSION_CONTROL_CAMERA
1698 taskIDict[taskID].PermsMask &= ~( 1736 4); // PERMISSION_TAKE_CONTROLS
1699 2048 | //PERMISSION_CONTROL_CAMERA
1700 4); // PERMISSION_TAKE_CONTROLS
1701 }
1702 } 1737 }
1703
1704 } 1738 }
1739 part.TaskInventory.LockItemsForRead(false);
1705 // Reset sit target. 1740 // Reset sit target.
1706 if (part.GetAvatarOnSitTarget() == UUID) 1741 if (part.GetAvatarOnSitTarget() == UUID)
1707 part.SetAvatarOnSitTarget(UUID.Zero); 1742 part.SetAvatarOnSitTarget(UUID.Zero);
1708
1709 m_parentPosition = part.GetWorldPosition(); 1743 m_parentPosition = part.GetWorldPosition();
1710 ControllingClient.SendClearFollowCamProperties(part.ParentUUID); 1744 ControllingClient.SendClearFollowCamProperties(part.ParentUUID);
1711 } 1745 }
1712 1746 // part.GetWorldRotation() is the rotation of the object being sat on
1713 if (m_physicsActor == null) 1747 // Rotation is the sittiing Av's rotation
1714 { 1748
1715 AddToPhysicalScene(false); 1749 Quaternion partRot;
1750// if (part.LinkNum == 1)
1751// { // Root prim of linkset
1752// partRot = part.ParentGroup.RootPart.RotationOffset;
1753// }
1754// else
1755// { // single or child prim
1756
1757// }
1758 if (part == null) //CW: Part may be gone. llDie() for example.
1759 {
1760 partRot = new Quaternion(0.0f, 0.0f, 0.0f, 1.0f);
1761 }
1762 else
1763 {
1764 partRot = part.GetWorldRotation();
1716 } 1765 }
1717 1766
1718 m_pos += m_parentPosition + new Vector3(0.0f, 0.0f, 2.0f*m_sitAvatarHeight); 1767 Quaternion partIRot = Quaternion.Inverse(partRot);
1719 m_parentPosition = Vector3.Zero; 1768
1769 Quaternion avatarRot = Quaternion.Inverse(Quaternion.Inverse(Rotation) * partIRot); // world or. of the av
1770 Vector3 avStandUp = new Vector3(1.0f, 0f, 0f) * avatarRot; // 1M infront of av
1720 1771
1721 m_parentID = 0; 1772
1773 if (m_physicsActor == null)
1774 {
1775 AddToPhysicalScene(false);
1776 }
1777 //CW: If the part isn't null then we can set the current position
1778 if (part != null)
1779 {
1780 Vector3 avWorldStandUp = avStandUp + part.GetWorldPosition() + (m_pos * partRot); // + av sit offset!
1781 AbsolutePosition = avWorldStandUp; //KF: Fix stand up.
1782 part.IsOccupied = false;
1783 }
1784 else
1785 {
1786 //CW: Since the part doesn't exist, a coarse standup position isn't an issue
1787 AbsolutePosition = m_lastWorldPosition;
1788 }
1789
1790 m_parentPosition = Vector3.Zero;
1791 m_parentID = 0;
1722 SendFullUpdateToAllClients(); 1792 SendFullUpdateToAllClients();
1723 m_requestedSitTargetID = 0; 1793 m_requestedSitTargetID = 0;
1794
1724 if ((m_physicsActor != null) && (m_avHeight > 0)) 1795 if ((m_physicsActor != null) && (m_avHeight > 0))
1725 { 1796 {
1726 SetHeight(m_avHeight); 1797 SetHeight(m_avHeight);
1727 } 1798 }
1728 } 1799 }
1729
1730 Animator.TrySetMovementAnimation("STAND"); 1800 Animator.TrySetMovementAnimation("STAND");
1731 } 1801 }
1732 1802
@@ -1757,13 +1827,9 @@ namespace OpenSim.Region.Framework.Scenes
1757 Vector3 avSitOffSet = part.SitTargetPosition; 1827 Vector3 avSitOffSet = part.SitTargetPosition;
1758 Quaternion avSitOrientation = part.SitTargetOrientation; 1828 Quaternion avSitOrientation = part.SitTargetOrientation;
1759 UUID avOnTargetAlready = part.GetAvatarOnSitTarget(); 1829 UUID avOnTargetAlready = part.GetAvatarOnSitTarget();
1760 1830 bool SitTargetOccupied = (avOnTargetAlready != UUID.Zero);
1761 bool SitTargetUnOccupied = (!(avOnTargetAlready != UUID.Zero)); 1831 bool SitTargetisSet = (Vector3.Zero != avSitOffSet); //NB Latest SL Spec shows Sit Rotation setting is ignored.
1762 bool SitTargetisSet = 1832 if (SitTargetisSet && !SitTargetOccupied)
1763 (!(avSitOffSet.X == 0f && avSitOffSet.Y == 0f && avSitOffSet.Z == 0f && avSitOrientation.W == 1f &&
1764 avSitOrientation.X == 0f && avSitOrientation.Y == 0f && avSitOrientation.Z == 0f));
1765
1766 if (SitTargetisSet && SitTargetUnOccupied)
1767 { 1833 {
1768 //switch the target to this prim 1834 //switch the target to this prim
1769 return part; 1835 return part;
@@ -1777,84 +1843,152 @@ namespace OpenSim.Region.Framework.Scenes
1777 private void SendSitResponse(IClientAPI remoteClient, UUID targetID, Vector3 offset, Quaternion pSitOrientation) 1843 private void SendSitResponse(IClientAPI remoteClient, UUID targetID, Vector3 offset, Quaternion pSitOrientation)
1778 { 1844 {
1779 bool autopilot = true; 1845 bool autopilot = true;
1846 Vector3 autopilotTarget = new Vector3();
1847 Quaternion sitOrientation = Quaternion.Identity;
1780 Vector3 pos = new Vector3(); 1848 Vector3 pos = new Vector3();
1781 Quaternion sitOrientation = pSitOrientation;
1782 Vector3 cameraEyeOffset = Vector3.Zero; 1849 Vector3 cameraEyeOffset = Vector3.Zero;
1783 Vector3 cameraAtOffset = Vector3.Zero; 1850 Vector3 cameraAtOffset = Vector3.Zero;
1784 bool forceMouselook = false; 1851 bool forceMouselook = false;
1785 1852
1786 //SceneObjectPart part = m_scene.GetSceneObjectPart(targetID); 1853 //SceneObjectPart part = m_scene.GetSceneObjectPart(targetID);
1787 SceneObjectPart part = FindNextAvailableSitTarget(targetID); 1854 SceneObjectPart part = FindNextAvailableSitTarget(targetID);
1788 if (part != null) 1855 if (part == null) return;
1789 { 1856
1790 // TODO: determine position to sit at based on scene geometry; don't trust offset from client 1857 // TODO: determine position to sit at based on scene geometry; don't trust offset from client
1791 // see http://wiki.secondlife.com/wiki/User:Andrew_Linden/Office_Hours/2007_11_06 for details on how LL does it 1858 // see http://wiki.secondlife.com/wiki/User:Andrew_Linden/Office_Hours/2007_11_06 for details on how LL does it
1792 1859
1793 // Is a sit target available? 1860 // part is the prim to sit on
1794 Vector3 avSitOffSet = part.SitTargetPosition; 1861 // offset is the world-ref vector distance from that prim center to the click-spot
1795 Quaternion avSitOrientation = part.SitTargetOrientation; 1862 // UUID is the UUID of the Avatar doing the clicking
1796 UUID avOnTargetAlready = part.GetAvatarOnSitTarget(); 1863
1797 1864 m_avInitialPos = AbsolutePosition; // saved to calculate unscripted sit rotation
1798 bool SitTargetUnOccupied = (!(avOnTargetAlready != UUID.Zero)); 1865
1799 bool SitTargetisSet = 1866 // Is a sit target available?
1800 (!(avSitOffSet.X == 0f && avSitOffSet.Y == 0f && avSitOffSet.Z == 0f && 1867 Vector3 avSitOffSet = part.SitTargetPosition;
1801 ( 1868 Quaternion avSitOrientation = part.SitTargetOrientation;
1802 avSitOrientation.X == 0f && avSitOrientation.Y == 0f && avSitOrientation.Z == 0f && avSitOrientation.W == 1f // Valid Zero Rotation quaternion 1869
1803 || avSitOrientation.X == 0f && avSitOrientation.Y == 0f && avSitOrientation.Z == 1f && avSitOrientation.W == 0f // W-Z Mapping was invalid at one point 1870 bool SitTargetisSet = (Vector3.Zero != avSitOffSet); //NB Latest SL Spec shows Sit Rotation setting is ignored.
1804 || avSitOrientation.X == 0f && avSitOrientation.Y == 0f && avSitOrientation.Z == 0f && avSitOrientation.W == 0f // Invalid Quaternion 1871 // Quaternion partIRot = Quaternion.Inverse(part.GetWorldRotation());
1805 ) 1872 Quaternion partRot;
1806 )); 1873// if (part.LinkNum == 1)
1807 1874// { // Root prim of linkset
1808 if (SitTargetisSet && SitTargetUnOccupied) 1875// partRot = part.ParentGroup.RootPart.RotationOffset;
1809 { 1876// }
1810 part.SetAvatarOnSitTarget(UUID); 1877// else
1811 offset = new Vector3(avSitOffSet.X, avSitOffSet.Y, avSitOffSet.Z); 1878// { // single or child prim
1812 sitOrientation = avSitOrientation; 1879 partRot = part.GetWorldRotation();
1813 autopilot = false; 1880// }
1814 } 1881 Quaternion partIRot = Quaternion.Inverse(partRot);
1815 1882//Console.WriteLine("SendSitResponse offset=" + offset + " Occup=" + part.IsOccupied + " TargSet=" + SitTargetisSet);
1816 pos = part.AbsolutePosition + offset; 1883 // Sit analysis rewritten by KF 091125
1817 //if (Math.Abs(part.AbsolutePosition.Z - AbsolutePosition.Z) > 1) 1884 if (SitTargetisSet) // scipted sit
1818 //{ 1885 {
1819 // offset = pos; 1886 if (!part.IsOccupied)
1820 //autopilot = false; 1887 {
1821 //} 1888//Console.WriteLine("Scripted, unoccupied");
1822 if (m_physicsActor != null) 1889 part.SetAvatarOnSitTarget(UUID); // set that Av will be on it
1823 { 1890 offset = new Vector3(avSitOffSet.X, avSitOffSet.Y, avSitOffSet.Z); // change ofset to the scripted one
1824 // If we're not using the client autopilot, we're immediately warping the avatar to the location 1891 sitOrientation = avSitOrientation; // Change rotatione to the scripted one
1825 // We can remove the physicsActor until they stand up. 1892 autopilot = false; // Jump direct to scripted llSitPos()
1826 m_sitAvatarHeight = m_physicsActor.Size.Z; 1893 }
1827 1894 else
1828 if (autopilot) 1895 {
1829 { 1896//Console.WriteLine("Scripted, occupied");
1830 if (Util.GetDistanceTo(AbsolutePosition, pos) < 4.5) 1897 return;
1831 { 1898 }
1832 autopilot = false; 1899 }
1900 else // Not Scripted
1901 {
1902 if ( (Math.Abs(offset.X) > 0.5f) || (Math.Abs(offset.Y) > 0.5f) )
1903 {
1904 // large prim & offset, ignore if other Avs sitting
1905// offset.Z -= 0.05f;
1906 m_avUnscriptedSitPos = offset * partIRot; // (non-zero) sit where clicked
1907 autopilotTarget = part.AbsolutePosition + offset; // World location of clicked point
1908
1909//Console.WriteLine(" offset ={0}", offset);
1910//Console.WriteLine(" UnscriptedSitPos={0}", m_avUnscriptedSitPos);
1911//Console.WriteLine(" autopilotTarget={0}", autopilotTarget);
1912
1913 }
1914 else // small offset
1915 {
1916//Console.WriteLine("Small offset");
1917 if (!part.IsOccupied)
1918 {
1919 m_avUnscriptedSitPos = Vector3.Zero; // Zero = Sit on prim center
1920 autopilotTarget = part.AbsolutePosition;
1921 }
1922 else return; // occupied small
1923 } // end large/small
1924 } // end Scripted/not
1925 cameraAtOffset = part.GetCameraAtOffset();
1926 cameraEyeOffset = part.GetCameraEyeOffset();
1927 forceMouselook = part.GetForceMouselook();
1928 if(cameraAtOffset == Vector3.Zero) cameraAtOffset = new Vector3(0f, 0f, 0.1f); //
1929 if(cameraEyeOffset == Vector3.Zero) cameraEyeOffset = new Vector3(0f, 0f, 0.1f); //
1833 1930
1834 RemoveFromPhysicalScene(); 1931 if (m_physicsActor != null)
1835 AbsolutePosition = pos + new Vector3(0.0f, 0.0f, m_sitAvatarHeight); 1932 {
1836 } 1933 // If we're not using the client autopilot, we're immediately warping the avatar to the location
1837 } 1934 // We can remove the physicsActor until they stand up.
1838 else 1935 m_sitAvatarHeight = m_physicsActor.Size.Z;
1936 if (autopilot)
1937 { // its not a scripted sit
1938// if (Util.GetDistanceTo(AbsolutePosition, autopilotTarget) < 4.5)
1939 if( (Math.Abs(AbsolutePosition.X - autopilotTarget.X) < 2.0f) && (Math.Abs(AbsolutePosition.Y - autopilotTarget.Y) < 2.0f) )
1839 { 1940 {
1941 autopilot = false; // close enough
1942 m_lastWorldPosition = m_pos; /* CW - This give us a position to return the avatar to if the part is killed before standup.
1943 Not using the part's position because returning the AV to the last known standing
1944 position is likely to be more friendly, isn't it? */
1840 RemoveFromPhysicalScene(); 1945 RemoveFromPhysicalScene();
1841 } 1946 AbsolutePosition = autopilotTarget + new Vector3(0.0f, 0.0f, (m_sitAvatarHeight / 2.0f)); // Warp av to over sit target
1947 } // else the autopilot will get us close
1948 }
1949 else
1950 { // its a scripted sit
1951 m_lastWorldPosition = part.AbsolutePosition; /* CW - This give us a position to return the avatar to if the part is killed before standup.
1952 I *am* using the part's position this time because we have no real idea how far away
1953 the avatar is from the sit target. */
1954 RemoveFromPhysicalScene();
1842 } 1955 }
1843
1844 cameraAtOffset = part.GetCameraAtOffset();
1845 cameraEyeOffset = part.GetCameraEyeOffset();
1846 forceMouselook = part.GetForceMouselook();
1847 } 1956 }
1848 1957 else return; // physactor is null!
1849 ControllingClient.SendSitResponse(targetID, offset, sitOrientation, autopilot, cameraAtOffset, cameraEyeOffset, forceMouselook); 1958
1850 m_requestedSitTargetUUID = targetID; 1959 Vector3 offsetr; // = offset * partIRot;
1960 // KF: In a linkset, offsetr needs to be relative to the group root! 091208
1961 // offsetr = (part.OffsetPosition * Quaternion.Inverse(part.ParentGroup.RootPart.RotationOffset)) + (offset * partIRot);
1962 // if (part.LinkNum < 2) 091216 All this was necessary because of the GetWorldRotation error.
1963 // { // Single, or Root prim of linkset, target is ClickOffset * RootRot
1964 offsetr = offset * partIRot;
1965//
1966 // else
1967 // { // Child prim, offset is (ChildOffset * RootRot) + (ClickOffset * ChildRot)
1968 // offsetr = //(part.OffsetPosition * Quaternion.Inverse(part.ParentGroup.RootPart.RotationOffset)) +
1969 // (offset * partRot);
1970 // }
1971
1972//Console.WriteLine(" ");
1973//Console.WriteLine("link number ={0}", part.LinkNum);
1974//Console.WriteLine("Prim offset ={0}", part.OffsetPosition );
1975//Console.WriteLine("Root Rotate ={0}", part.ParentGroup.RootPart.RotationOffset);
1976//Console.WriteLine("Click offst ={0}", offset);
1977//Console.WriteLine("Prim Rotate ={0}", part.GetWorldRotation());
1978//Console.WriteLine("offsetr ={0}", offsetr);
1979//Console.WriteLine("Camera At ={0}", cameraAtOffset);
1980//Console.WriteLine("Camera Eye ={0}", cameraEyeOffset);
1981
1982 ControllingClient.SendSitResponse(part.UUID, offsetr, sitOrientation, autopilot, cameraAtOffset, cameraEyeOffset, forceMouselook);
1983 m_requestedSitTargetUUID = part.UUID; //KF: Correct autopilot target
1851 // This calls HandleAgentSit twice, once from here, and the client calls 1984 // This calls HandleAgentSit twice, once from here, and the client calls
1852 // HandleAgentSit itself after it gets to the location 1985 // HandleAgentSit itself after it gets to the location
1853 // It doesn't get to the location until we've moved them there though 1986 // It doesn't get to the location until we've moved them there though
1854 // which happens in HandleAgentSit :P 1987 // which happens in HandleAgentSit :P
1855 m_autopilotMoving = autopilot; 1988 m_autopilotMoving = autopilot;
1856 m_autoPilotTarget = pos; 1989 m_autoPilotTarget = autopilotTarget;
1857 m_sitAtAutoTarget = autopilot; 1990 m_sitAtAutoTarget = autopilot;
1991 m_initialSitTarget = autopilotTarget;
1858 if (!autopilot) 1992 if (!autopilot)
1859 HandleAgentSit(remoteClient, UUID); 1993 HandleAgentSit(remoteClient, UUID);
1860 } 1994 }
@@ -2149,31 +2283,65 @@ namespace OpenSim.Region.Framework.Scenes
2149 { 2283 {
2150 if (part != null) 2284 if (part != null)
2151 { 2285 {
2286//Console.WriteLine("Link #{0}, Rot {1}", part.LinkNum, part.GetWorldRotation());
2152 if (part.GetAvatarOnSitTarget() == UUID) 2287 if (part.GetAvatarOnSitTarget() == UUID)
2153 { 2288 {
2289//Console.WriteLine("Scripted Sit");
2290 // Scripted sit
2154 Vector3 sitTargetPos = part.SitTargetPosition; 2291 Vector3 sitTargetPos = part.SitTargetPosition;
2155 Quaternion sitTargetOrient = part.SitTargetOrientation; 2292 Quaternion sitTargetOrient = part.SitTargetOrientation;
2156
2157 //Quaternion vq = new Quaternion(sitTargetPos.X, sitTargetPos.Y+0.2f, sitTargetPos.Z+0.2f, 0);
2158 //Quaternion nq = new Quaternion(-sitTargetOrient.X, -sitTargetOrient.Y, -sitTargetOrient.Z, sitTargetOrient.w);
2159
2160 //Quaternion result = (sitTargetOrient * vq) * nq;
2161
2162 m_pos = new Vector3(sitTargetPos.X, sitTargetPos.Y, sitTargetPos.Z); 2293 m_pos = new Vector3(sitTargetPos.X, sitTargetPos.Y, sitTargetPos.Z);
2163 m_pos += SIT_TARGET_ADJUSTMENT; 2294 m_pos += SIT_TARGET_ADJUSTMENT;
2164 m_bodyRot = sitTargetOrient; 2295 m_bodyRot = sitTargetOrient;
2165 //Rotation = sitTargetOrient;
2166 m_parentPosition = part.AbsolutePosition; 2296 m_parentPosition = part.AbsolutePosition;
2167 2297 part.IsOccupied = true;
2168 //SendTerseUpdateToAllClients();
2169 } 2298 }
2170 else 2299 else
2171 { 2300 {
2172 m_pos -= part.AbsolutePosition; 2301 // if m_avUnscriptedSitPos is zero then Av sits above center
2302 // Else Av sits at m_avUnscriptedSitPos
2303
2304 // Non-scripted sit by Kitto Flora 21Nov09
2305 // Calculate angle of line from prim to Av
2306 Quaternion partIRot;
2307// if (part.LinkNum == 1)
2308// { // Root prim of linkset
2309// partIRot = Quaternion.Inverse(part.ParentGroup.RootPart.RotationOffset);
2310// }
2311// else
2312// { // single or child prim
2313 partIRot = Quaternion.Inverse(part.GetWorldRotation());
2314// }
2315 Vector3 sitTargetPos= part.AbsolutePosition + m_avUnscriptedSitPos;
2316 float y_diff = (m_avInitialPos.Y - sitTargetPos.Y);
2317 float x_diff = ( m_avInitialPos.X - sitTargetPos.X);
2318 if(Math.Abs(x_diff) < 0.001f) x_diff = 0.001f; // avoid div by 0
2319 if(Math.Abs(y_diff) < 0.001f) y_diff = 0.001f; // avoid pol flip at 0
2320 float sit_angle = (float)Math.Atan2( (double)y_diff, (double)x_diff);
2321 // NOTE: when sitting m_ pos and m_bodyRot are *relative* to the prim location/rotation, not 'World'.
2322 // Av sits at world euler <0,0, z>, translated by part rotation
2323 m_bodyRot = partIRot * Quaternion.CreateFromEulers(0f, 0f, sit_angle); // sit at 0,0,inv-click
2324
2173 m_parentPosition = part.AbsolutePosition; 2325 m_parentPosition = part.AbsolutePosition;
2174 } 2326 part.IsOccupied = true;
2327 m_pos = new Vector3(0f, 0f, 0.05f) + // corrections to get Sit Animation
2328 (new Vector3(0.0f, 0f, 0.61f) * partIRot) + // located on center
2329 (new Vector3(0.34f, 0f, 0.0f) * m_bodyRot) +
2330 m_avUnscriptedSitPos; // adds click offset, if any
2331 //Set up raytrace to find top surface of prim
2332 Vector3 size = part.Scale;
2333 float mag = 2.0f; // 0.1f + (float)Math.Sqrt((size.X * size.X) + (size.Y * size.Y) + (size.Z * size.Z));
2334 Vector3 start = part.AbsolutePosition + new Vector3(0f, 0f, mag);
2335 Vector3 down = new Vector3(0f, 0f, -1f);
2336//Console.WriteLine("st={0} do={1} ma={2}", start, down, mag);
2337 m_scene.PhysicsScene.RaycastWorld(
2338 start, // Vector3 position,
2339 down, // Vector3 direction,
2340 mag, // float length,
2341 SitAltitudeCallback); // retMethod
2342 } // end scripted/not
2175 } 2343 }
2176 else 2344 else // no Av
2177 { 2345 {
2178 return; 2346 return;
2179 } 2347 }
@@ -2185,11 +2353,36 @@ namespace OpenSim.Region.Framework.Scenes
2185 2353
2186 Animator.TrySetMovementAnimation(sitAnimation); 2354 Animator.TrySetMovementAnimation(sitAnimation);
2187 SendFullUpdateToAllClients(); 2355 SendFullUpdateToAllClients();
2188 // This may seem stupid, but Our Full updates don't send avatar rotation :P
2189 // So we're also sending a terse update (which has avatar rotation)
2190 // [Update] We do now.
2191 //SendTerseUpdateToAllClients();
2192 } 2356 }
2357
2358 public void SitAltitudeCallback(bool hitYN, Vector3 collisionPoint, uint localid, float distance, Vector3 normal)
2359 {
2360 // KF: 091202 There appears to be a bug in Prim Edit Size - the process sometimes make a prim that RayTrace no longer
2361 // sees. Take/re-rez, or sim restart corrects the condition. Result of bug is incorrect sit height.
2362 if(hitYN)
2363 {
2364 // m_pos = Av offset from prim center to make look like on center
2365 // m_parentPosition = Actual center pos of prim
2366 // collisionPoint = spot on prim where we want to sit
2367 // collisionPoint.Z = global sit surface height
2368 SceneObjectPart part = m_scene.GetSceneObjectPart(localid);
2369 Quaternion partIRot;
2370// if (part.LinkNum == 1)
2371/// { // Root prim of linkset
2372// partIRot = Quaternion.Inverse(part.ParentGroup.RootPart.RotationOffset);
2373// }
2374// else
2375// { // single or child prim
2376 partIRot = Quaternion.Inverse(part.GetWorldRotation());
2377// }
2378 float offZ = collisionPoint.Z - m_initialSitTarget.Z;
2379 Vector3 offset = new Vector3(0.0f, 0.0f, offZ) * partIRot; // Altitude correction
2380//Console.WriteLine("sitPoint={0}, offset={1}", sitPoint, offset);
2381 m_pos += offset;
2382// ControllingClient.SendClearFollowCamProperties(part.UUID);
2383
2384 }
2385 } // End SitAltitudeCallback KF.
2193 2386
2194 /// <summary> 2387 /// <summary>
2195 /// Event handler for the 'Always run' setting on the client 2388 /// Event handler for the 'Always run' setting on the client
@@ -2219,7 +2412,7 @@ namespace OpenSim.Region.Framework.Scenes
2219 /// </summary> 2412 /// </summary>
2220 /// <param name="vec">The vector in which to move. This is relative to the rotation argument</param> 2413 /// <param name="vec">The vector in which to move. This is relative to the rotation argument</param>
2221 /// <param name="rotation">The direction in which this avatar should now face. 2414 /// <param name="rotation">The direction in which this avatar should now face.
2222 public void AddNewMovement(Vector3 vec, Quaternion rotation) 2415 public void AddNewMovement(Vector3 vec, Quaternion rotation, bool Nudging)
2223 { 2416 {
2224 if (m_isChildAgent) 2417 if (m_isChildAgent)
2225 { 2418 {
@@ -2296,7 +2489,7 @@ namespace OpenSim.Region.Framework.Scenes
2296 2489
2297 // TODO: Add the force instead of only setting it to support multiple forces per frame? 2490 // TODO: Add the force instead of only setting it to support multiple forces per frame?
2298 m_forceToApply = direc; 2491 m_forceToApply = direc;
2299 2492 m_isNudging = Nudging;
2300 m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS)); 2493 m_scene.StatsReporter.AddAgentTime(Util.EnvironmentTickCountSubtract(m_perfMonMS));
2301 } 2494 }
2302 2495
@@ -2311,7 +2504,7 @@ namespace OpenSim.Region.Framework.Scenes
2311 const float POSITION_TOLERANCE = 0.05f; 2504 const float POSITION_TOLERANCE = 0.05f;
2312 //const int TIME_MS_TOLERANCE = 3000; 2505 //const int TIME_MS_TOLERANCE = 3000;
2313 2506
2314 SendPrimUpdates(); 2507
2315 2508
2316 if (m_newCoarseLocations) 2509 if (m_newCoarseLocations)
2317 { 2510 {
@@ -2347,6 +2540,9 @@ namespace OpenSim.Region.Framework.Scenes
2347 CheckForBorderCrossing(); 2540 CheckForBorderCrossing();
2348 CheckForSignificantMovement(); // sends update to the modules. 2541 CheckForSignificantMovement(); // sends update to the modules.
2349 } 2542 }
2543
2544 //Sending prim updates AFTER the avatar terse updates are sent
2545 SendPrimUpdates();
2350 } 2546 }
2351 2547
2352 #endregion 2548 #endregion
@@ -3251,14 +3447,25 @@ namespace OpenSim.Region.Framework.Scenes
3251 { 3447 {
3252 if (m_forceToApply.HasValue) 3448 if (m_forceToApply.HasValue)
3253 { 3449 {
3254 Vector3 force = m_forceToApply.Value;
3255 3450
3451 Vector3 force = m_forceToApply.Value;
3256 m_updateflag = true; 3452 m_updateflag = true;
3257// movementvector = force;
3258 Velocity = force; 3453 Velocity = force;
3259 3454
3260 m_forceToApply = null; 3455 m_forceToApply = null;
3261 } 3456 }
3457 else
3458 {
3459 if (m_isNudging)
3460 {
3461 Vector3 force = Vector3.Zero;
3462
3463 m_updateflag = true;
3464 Velocity = force;
3465 m_isNudging = false;
3466 m_updateCount = UPDATE_COUNT; //KF: Update anims to pickup "STAND"
3467 }
3468 }
3262 } 3469 }
3263 3470
3264 public override void SetText(string text, Vector3 color, double alpha) 3471 public override void SetText(string text, Vector3 color, double alpha)
@@ -3309,18 +3516,29 @@ namespace OpenSim.Region.Framework.Scenes
3309 { 3516 {
3310 if (e == null) 3517 if (e == null)
3311 return; 3518 return;
3312 3519
3313 //if ((Math.Abs(Velocity.X) > 0.1e-9f) || (Math.Abs(Velocity.Y) > 0.1e-9f)) 3520 // The Physics Scene will send (spam!) updates every 500 ms grep: m_physicsActor.SubscribeEvents(
3314 // The Physics Scene will send updates every 500 ms grep: m_physicsActor.SubscribeEvents(
3315 // as of this comment the interval is set in AddToPhysicalScene 3521 // as of this comment the interval is set in AddToPhysicalScene
3316 if (Animator!=null) 3522 if (Animator!=null)
3317 Animator.UpdateMovementAnimations(); 3523 {
3524 if (m_updateCount > 0) //KF: DO NOT call UpdateMovementAnimations outside of the m_updateCount wrapper,
3525 { // else its will lock out other animation changes, like ground sit.
3526 Animator.UpdateMovementAnimations();
3527 m_updateCount--;
3528 }
3529 }
3318 3530
3319 CollisionEventUpdate collisionData = (CollisionEventUpdate)e; 3531 CollisionEventUpdate collisionData = (CollisionEventUpdate)e;
3320 Dictionary<uint, ContactPoint> coldata = collisionData.m_objCollisionList; 3532 Dictionary<uint, ContactPoint> coldata = collisionData.m_objCollisionList;
3321 3533
3322 CollisionPlane = Vector4.UnitW; 3534 CollisionPlane = Vector4.UnitW;
3323 3535
3536 if (m_lastColCount != coldata.Count)
3537 {
3538 m_updateCount = UPDATE_COUNT;
3539 m_lastColCount = coldata.Count;
3540 }
3541
3324 if (coldata.Count != 0 && Animator != null) 3542 if (coldata.Count != 0 && Animator != null)
3325 { 3543 {
3326 switch (Animator.CurrentMovementAnimation) 3544 switch (Animator.CurrentMovementAnimation)
@@ -3927,5 +4145,16 @@ namespace OpenSim.Region.Framework.Scenes
3927 m_reprioritization_called = false; 4145 m_reprioritization_called = false;
3928 } 4146 }
3929 } 4147 }
4148
4149 private Vector3 Quat2Euler(Quaternion rot){
4150 float x = Utils.RAD_TO_DEG * (float)Math.Atan2((double)((2.0f * rot.X * rot.W) - (2.0f * rot.Y * rot.Z)) ,
4151 (double)(1 - (2.0f * rot.X * rot.X) - (2.0f * rot.Z * rot.Z)));
4152 float y = Utils.RAD_TO_DEG * (float)Math.Asin ((double)((2.0f * rot.X * rot.Y) + (2.0f * rot.Z * rot.W)));
4153 float z = Utils.RAD_TO_DEG * (float)Math.Atan2(((double)(2.0f * rot.Y * rot.W) - (2.0f * rot.X * rot.Z)) ,
4154 (double)(1 - (2.0f * rot.Y * rot.Y) - (2.0f * rot.Z * rot.Z)));
4155 return(new Vector3(x,y,z));
4156 }
4157
4158
3930 } 4159 }
3931} 4160}
diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
index c6cf4cc..4ba4fab 100644
--- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
@@ -75,7 +75,7 @@ namespace OpenSim.Region.Framework.Scenes
75 75
76 foreach (EntityBase e in m_presence.Scene.Entities) 76 foreach (EntityBase e in m_presence.Scene.Entities)
77 { 77 {
78 if (e is SceneObjectGroup) 78 if (e != null && e is SceneObjectGroup)
79 m_pendingObjects.Enqueue((SceneObjectGroup)e); 79 m_pendingObjects.Enqueue((SceneObjectGroup)e);
80 } 80 }
81 } 81 }
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
index c77220c..68035ca 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
@@ -101,7 +101,16 @@ namespace OpenSim.Region.Framework.Scenes.Tests
101 { 101 {
102 throw new NotImplementedException(); 102 throw new NotImplementedException();
103 } 103 }
104 104 public RegionMeta7WindlightData LoadRegionWindlightSettings(UUID regionUUID)
105 {
106 //This connector doesn't support the windlight module yet
107 //Return default LL windlight settings
108 return new RegionMeta7WindlightData();
109 }
110 public void StoreRegionWindlightSettings(RegionMeta7WindlightData wl)
111 {
112 //This connector doesn't support the windlight module yet
113 }
105 public RegionSettings LoadRegionSettings(UUID regionUUID) 114 public RegionSettings LoadRegionSettings(UUID regionUUID)
106 { 115 {
107 return null; 116 return null;
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 96530a1..99e5b84 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -963,7 +963,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
963 // TODO 963 // TODO
964 } 964 }
965 965
966 public void SendGenericMessage(string method, List<string> message) 966 public void SendGenericMessage(string method, List<byte[]> message)
967 { 967 {
968 968
969 } 969 }
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index f8ab8d8..15473d8 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -549,7 +549,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
549 549
550 } 550 }
551 551
552 public void SendGenericMessage(string method, List<string> message) 552 public void SendGenericMessage(string method, List<byte[]> message)
553 { 553 {
554 554
555 } 555 }
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs
index 5e2eeeb..25bf297 100644
--- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs
+++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsActor.cs
@@ -184,7 +184,17 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
184 { 184 {
185 185
186 } 186 }
187
188 public override void VehicleFlagsSet(int flags)
189 {
190
191 }
192
193 public override void VehicleFlagsRemove(int flags)
194 {
187 195
196 }
197
188 public override void VehicleFlags(int param, bool remove) 198 public override void VehicleFlags(int param, bool remove)
189 { 199 {
190 200
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs
index 6a54705..7d5c078 100644
--- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs
+++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs
@@ -361,7 +361,17 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
361 { 361 {
362 362
363 } 363 }
364
365 public override void VehicleFlagsSet(int flags)
366 {
367
368 }
369
370 public override void VehicleFlagsRemove(int flags)
371 {
364 372
373 }
374
365 public override void VehicleFlags(int param, bool remove) 375 public override void VehicleFlags(int param, bool remove)
366 { 376 {
367 377
@@ -624,8 +634,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
624 { 634 {
625 set { return; } 635 set { return; }
626 } 636 }
627 637
628
629 public override Quaternion APIDTarget 638 public override Quaternion APIDTarget
630 { 639 {
631 set { return; } 640 set { return; }
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs
index 920ed96..1f3e031 100644
--- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs
+++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs
@@ -396,7 +396,17 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
396 { 396 {
397 //TODO: 397 //TODO:
398 } 398 }
399
400 public override void VehicleFlagsSet(int flags)
401 {
402
403 }
404
405 public override void VehicleFlagsRemove(int flags)
406 {
399 407
408 }
409
400 public override void VehicleFlags(int param, bool remove) 410 public override void VehicleFlags(int param, bool remove)
401 { 411 {
402 412
diff --git a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
index e2a6a2e..17f99f5 100644
--- a/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
+++ b/OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
@@ -997,11 +997,21 @@ namespace OpenSim.Region.Physics.BulletXPlugin
997 997
998 } 998 }
999 999
1000 public override void VehicleFlags(int param, bool remove) 1000 public override void VehicleFlagsSet(int flags)
1001 {
1002
1003 }
1004
1005 public override void VehicleFlagsRemove(int flags)
1001 { 1006 {
1002 1007
1003 } 1008 }
1004 1009
1010 public override void VehicleFlags(int param, bool remove)
1011 {
1012
1013 }
1014
1005 public override void SetVolumeDetect(int param) 1015 public override void SetVolumeDetect(int param)
1006 { 1016 {
1007 1017
diff --git a/OpenSim/Region/Physics/ChOdePlugin/AssemblyInfo.cs b/OpenSim/Region/Physics/ChOdePlugin/AssemblyInfo.cs
new file mode 100644
index 0000000..d65929a
--- /dev/null
+++ b/OpenSim/Region/Physics/ChOdePlugin/AssemblyInfo.cs
@@ -0,0 +1,58 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System.Reflection;
29using System.Runtime.InteropServices;
30
31// Information about this assembly is defined by the following
32// attributes.
33//
34// change them to the information which is associated with the assembly
35// you compile.
36
37[assembly : AssemblyTitle("OdePlugin")]
38[assembly : AssemblyDescription("")]
39[assembly : AssemblyConfiguration("")]
40[assembly : AssemblyCompany("http://opensimulator.org")]
41[assembly : AssemblyProduct("OdePlugin")]
42[assembly : AssemblyCopyright("Copyright (c) OpenSimulator.org Developers 2007-2009")]
43[assembly : AssemblyTrademark("")]
44[assembly : AssemblyCulture("")]
45
46// This sets the default COM visibility of types in the assembly to invisible.
47// If you need to expose a type to COM, use [ComVisible(true)] on that type.
48
49[assembly : ComVisible(false)]
50
51// The assembly version has following format :
52//
53// Major.Minor.Build.Revision
54//
55// You can specify all values by your own or you can build default build and revision
56// numbers with the '*' character (the default):
57
58[assembly : AssemblyVersion("0.6.5.*")]
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs
new file mode 100644
index 0000000..6dadbe5
--- /dev/null
+++ b/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs
@@ -0,0 +1,1367 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Collections.Generic;
30using System.Reflection;
31using OpenMetaverse;
32using Ode.NET;
33using OpenSim.Framework;
34using OpenSim.Region.Physics.Manager;
35using log4net;
36
37namespace OpenSim.Region.Physics.OdePlugin
38{
39 /// <summary>
40 /// Various properties that ODE uses for AMotors but isn't exposed in ODE.NET so we must define them ourselves.
41 /// </summary>
42
43 public enum dParam : int
44 {
45 LowStop = 0,
46 HiStop = 1,
47 Vel = 2,
48 FMax = 3,
49 FudgeFactor = 4,
50 Bounce = 5,
51 CFM = 6,
52 StopERP = 7,
53 StopCFM = 8,
54 LoStop2 = 256,
55 HiStop2 = 257,
56 Vel2 = 258,
57 FMax2 = 259,
58 StopERP2 = 7 + 256,
59 StopCFM2 = 8 + 256,
60 LoStop3 = 512,
61 HiStop3 = 513,
62 Vel3 = 514,
63 FMax3 = 515,
64 StopERP3 = 7 + 512,
65 StopCFM3 = 8 + 512
66 }
67 public class OdeCharacter : PhysicsActor
68 {
69 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
70
71 private Vector3 _position;
72 private d.Vector3 _zeroPosition;
73 // private d.Matrix3 m_StandUpRotation;
74 private bool _zeroFlag = false;
75 private bool m_lastUpdateSent = false;
76 private Vector3 _velocity;
77 private Vector3 _target_velocity;
78 private Vector3 _acceleration;
79 private Vector3 m_rotationalVelocity;
80 private float m_mass = 80f;
81 public float m_density = 60f;
82 private bool m_pidControllerActive = true;
83 public float PID_D = 800.0f;
84 public float PID_P = 900.0f;
85 //private static float POSTURE_SERVO = 10000.0f;
86 public float CAPSULE_RADIUS = 0.37f;
87 public float CAPSULE_LENGTH = 2.140599f;
88 public float m_tensor = 3800000f;
89 public float heightFudgeFactor = 0.52f;
90 public float walkDivisor = 1.3f;
91 public float runDivisor = 0.8f;
92 private bool flying = false;
93 private bool m_iscolliding = false;
94 private bool m_iscollidingGround = false;
95 private bool m_wascolliding = false;
96 private bool m_wascollidingGround = false;
97 private bool m_iscollidingObj = false;
98 private bool m_alwaysRun = false;
99 private bool m_hackSentFall = false;
100 private bool m_hackSentFly = false;
101 private int m_requestedUpdateFrequency = 0;
102 private Vector3 m_taintPosition = Vector3.Zero;
103 public uint m_localID = 0;
104 public bool m_returnCollisions = false;
105 // taints and their non-tainted counterparts
106 public bool m_isPhysical = false; // the current physical status
107 public bool m_tainted_isPhysical = false; // set when the physical status is tainted (false=not existing in physics engine, true=existing)
108 public float MinimumGroundFlightOffset = 3f;
109
110 private float m_tainted_CAPSULE_LENGTH; // set when the capsule length changes.
111 private float m_tiltMagnitudeWhenProjectedOnXYPlane = 0.1131371f; // used to introduce a fixed tilt because a straight-up capsule falls through terrain, probably a bug in terrain collider
112
113
114 private float m_buoyancy = 0f;
115
116 // private CollisionLocker ode;
117
118 private string m_name = String.Empty;
119
120 private bool[] m_colliderarr = new bool[11];
121 private bool[] m_colliderGroundarr = new bool[11];
122
123 // Default we're a Character
124 private CollisionCategories m_collisionCategories = (CollisionCategories.Character);
125
126 // Default, Collide with Other Geometries, spaces, bodies and characters.
127 private CollisionCategories m_collisionFlags = (CollisionCategories.Geom
128 | CollisionCategories.Space
129 | CollisionCategories.Body
130 | CollisionCategories.Character
131 | CollisionCategories.Land);
132 public IntPtr Body = IntPtr.Zero;
133 private OdeScene _parent_scene;
134 public IntPtr Shell = IntPtr.Zero;
135 public IntPtr Amotor = IntPtr.Zero;
136 public d.Mass ShellMass;
137 public bool collidelock = false;
138
139 public int m_eventsubscription = 0;
140 private CollisionEventUpdate CollisionEventsThisFrame = new CollisionEventUpdate();
141
142 // unique UUID of this character object
143 public UUID m_uuid;
144 public bool bad = false;
145
146 public OdeCharacter(String avName, OdeScene parent_scene, Vector3 pos, CollisionLocker dode, Vector3 size, float pid_d, float pid_p, float capsule_radius, float tensor, float density, float height_fudge_factor, float walk_divisor, float rundivisor)
147 {
148 m_uuid = UUID.Random();
149
150 if (pos.IsFinite())
151 {
152 if (pos.Z > 9999999f)
153 {
154 pos.Z = parent_scene.GetTerrainHeightAtXY(127, 127) + 5;
155 }
156 if (pos.Z < -90000f)
157 {
158 pos.Z = parent_scene.GetTerrainHeightAtXY(127, 127) + 5;
159 }
160 _position = pos;
161 m_taintPosition.X = pos.X;
162 m_taintPosition.Y = pos.Y;
163 m_taintPosition.Z = pos.Z;
164 }
165 else
166 {
167 _position = new Vector3(((float)_parent_scene.WorldExtents.X * 0.5f), ((float)_parent_scene.WorldExtents.Y * 0.5f), parent_scene.GetTerrainHeightAtXY(128f, 128f) + 10f);
168 m_taintPosition.X = _position.X;
169 m_taintPosition.Y = _position.Y;
170 m_taintPosition.Z = _position.Z;
171 m_log.Warn("[PHYSICS]: Got NaN Position on Character Create");
172 }
173
174 _parent_scene = parent_scene;
175
176 PID_D = pid_d;
177 PID_P = pid_p;
178 CAPSULE_RADIUS = capsule_radius;
179 m_tensor = tensor;
180 m_density = density;
181 heightFudgeFactor = height_fudge_factor;
182 walkDivisor = walk_divisor;
183 runDivisor = rundivisor;
184
185 // m_StandUpRotation =
186 // new d.Matrix3(0.5f, 0.7071068f, 0.5f, -0.7071068f, 0f, 0.7071068f, 0.5f, -0.7071068f,
187 // 0.5f);
188
189 for (int i = 0; i < 11; i++)
190 {
191 m_colliderarr[i] = false;
192 }
193 CAPSULE_LENGTH = (size.Z * 1.15f) - CAPSULE_RADIUS * 2.0f;
194 //m_log.Info("[SIZE]: " + CAPSULE_LENGTH.ToString());
195 m_tainted_CAPSULE_LENGTH = CAPSULE_LENGTH;
196
197 m_isPhysical = false; // current status: no ODE information exists
198 m_tainted_isPhysical = true; // new tainted status: need to create ODE information
199
200 _parent_scene.AddPhysicsActorTaint(this);
201
202 m_name = avName;
203 }
204
205 public override int PhysicsActorType
206 {
207 get { return (int) ActorTypes.Agent; }
208 set { return; }
209 }
210
211 /// <summary>
212 /// If this is set, the avatar will move faster
213 /// </summary>
214 public override bool SetAlwaysRun
215 {
216 get { return m_alwaysRun; }
217 set { m_alwaysRun = value; }
218 }
219
220 public override uint LocalID
221 {
222 set { m_localID = value; }
223 }
224
225 public override bool Grabbed
226 {
227 set { return; }
228 }
229
230 public override bool Selected
231 {
232 set { return; }
233 }
234
235 public override float Buoyancy
236 {
237 get { return m_buoyancy; }
238 set { m_buoyancy = value; }
239 }
240
241 public override bool FloatOnWater
242 {
243 set { return; }
244 }
245
246 public override bool IsPhysical
247 {
248 get { return false; }
249 set { return; }
250 }
251
252 public override bool ThrottleUpdates
253 {
254 get { return false; }
255 set { return; }
256 }
257
258 public override bool Flying
259 {
260 get { return flying; }
261 set { flying = value; }
262 }
263
264 /// <summary>
265 /// Returns if the avatar is colliding in general.
266 /// This includes the ground and objects and avatar.
267 /// </summary>
268 public override bool IsColliding
269 {
270 get { return m_iscolliding; }
271 set
272 {
273 int i;
274 int truecount = 0;
275 int falsecount = 0;
276
277 if (m_colliderarr.Length >= 10)
278 {
279 for (i = 0; i < 10; i++)
280 {
281 m_colliderarr[i] = m_colliderarr[i + 1];
282 }
283 }
284 m_colliderarr[10] = value;
285
286 for (i = 0; i < 11; i++)
287 {
288 if (m_colliderarr[i])
289 {
290 truecount++;
291 }
292 else
293 {
294 falsecount++;
295 }
296 }
297
298 // Equal truecounts and false counts means we're colliding with something.
299
300 if (falsecount > 1.2*truecount)
301 {
302 m_iscolliding = false;
303 }
304 else
305 {
306 m_iscolliding = true;
307 }
308 if (m_wascolliding != m_iscolliding)
309 {
310 //base.SendCollisionUpdate(new CollisionEventUpdate());
311 }
312 m_wascolliding = m_iscolliding;
313 }
314 }
315
316 /// <summary>
317 /// Returns if an avatar is colliding with the ground
318 /// </summary>
319 public override bool CollidingGround
320 {
321 get { return m_iscollidingGround; }
322 set
323 {
324 // Collisions against the ground are not really reliable
325 // So, to get a consistant value we have to average the current result over time
326 // Currently we use 1 second = 10 calls to this.
327 int i;
328 int truecount = 0;
329 int falsecount = 0;
330
331 if (m_colliderGroundarr.Length >= 10)
332 {
333 for (i = 0; i < 10; i++)
334 {
335 m_colliderGroundarr[i] = m_colliderGroundarr[i + 1];
336 }
337 }
338 m_colliderGroundarr[10] = value;
339
340 for (i = 0; i < 11; i++)
341 {
342 if (m_colliderGroundarr[i])
343 {
344 truecount++;
345 }
346 else
347 {
348 falsecount++;
349 }
350 }
351
352 // Equal truecounts and false counts means we're colliding with something.
353
354 if (falsecount > 1.2*truecount)
355 {
356 m_iscollidingGround = false;
357 }
358 else
359 {
360 m_iscollidingGround = true;
361 }
362 if (m_wascollidingGround != m_iscollidingGround)
363 {
364 //base.SendCollisionUpdate(new CollisionEventUpdate());
365 }
366 m_wascollidingGround = m_iscollidingGround;
367 }
368 }
369
370 /// <summary>
371 /// Returns if the avatar is colliding with an object
372 /// </summary>
373 public override bool CollidingObj
374 {
375 get { return m_iscollidingObj; }
376 set
377 {
378 m_iscollidingObj = value;
379 if (value)
380 m_pidControllerActive = false;
381 else
382 m_pidControllerActive = true;
383 }
384 }
385
386 /// <summary>
387 /// turn the PID controller on or off.
388 /// The PID Controller will turn on all by itself in many situations
389 /// </summary>
390 /// <param name="status"></param>
391 public void SetPidStatus(bool status)
392 {
393 m_pidControllerActive = status;
394 }
395
396 public override bool Stopped
397 {
398 get { return _zeroFlag; }
399 }
400
401 /// <summary>
402 /// This 'puts' an avatar somewhere in the physics space.
403 /// Not really a good choice unless you 'know' it's a good
404 /// spot otherwise you're likely to orbit the avatar.
405 /// </summary>
406 public override Vector3 Position
407 {
408 get { return _position; }
409 set
410 {
411 if (Body == IntPtr.Zero || Shell == IntPtr.Zero)
412 {
413 if (value.IsFinite())
414 {
415 if (value.Z > 9999999f)
416 {
417 value.Z = _parent_scene.GetTerrainHeightAtXY(127, 127) + 5;
418 }
419 if (value.Z < -90000f)
420 {
421 value.Z = _parent_scene.GetTerrainHeightAtXY(127, 127) + 5;
422 }
423
424 _position.X = value.X;
425 _position.Y = value.Y;
426 _position.Z = value.Z;
427
428 m_taintPosition.X = value.X;
429 m_taintPosition.Y = value.Y;
430 m_taintPosition.Z = value.Z;
431 _parent_scene.AddPhysicsActorTaint(this);
432 }
433 else
434 {
435 m_log.Warn("[PHYSICS]: Got a NaN Position from Scene on a Character");
436 }
437 }
438 }
439 }
440
441 public override Vector3 RotationalVelocity
442 {
443 get { return m_rotationalVelocity; }
444 set { m_rotationalVelocity = value; }
445 }
446
447 /// <summary>
448 /// This property sets the height of the avatar only. We use the height to make sure the avatar stands up straight
449 /// and use it to offset landings properly
450 /// </summary>
451 public override Vector3 Size
452 {
453 get { return new Vector3(CAPSULE_RADIUS * 2, CAPSULE_RADIUS * 2, CAPSULE_LENGTH); }
454 set
455 {
456 if (value.IsFinite())
457 {
458 m_pidControllerActive = true;
459
460 Vector3 SetSize = value;
461 m_tainted_CAPSULE_LENGTH = (SetSize.Z*1.15f) - CAPSULE_RADIUS*2.0f;
462 //m_log.Info("[SIZE]: " + CAPSULE_LENGTH.ToString());
463
464 Velocity = Vector3.Zero;
465
466 _parent_scene.AddPhysicsActorTaint(this);
467 }
468 else
469 {
470 m_log.Warn("[PHYSICS]: Got a NaN Size from Scene on a Character");
471 }
472 }
473 }
474
475 private void AlignAvatarTiltWithCurrentDirectionOfMovement(Vector3 movementVector)
476 {
477 movementVector.Z = 0f;
478 float magnitude = (float)Math.Sqrt((double)(movementVector.X * movementVector.X + movementVector.Y * movementVector.Y));
479 if (magnitude < 0.1f) return;
480
481 // normalize the velocity vector
482 float invMagnitude = 1.0f / magnitude;
483 movementVector.X *= invMagnitude;
484 movementVector.Y *= invMagnitude;
485
486 // if we change the capsule heading too often, the capsule can fall down
487 // therefore we snap movement vector to just 1 of 4 predefined directions (ne, nw, se, sw),
488 // meaning only 4 possible capsule tilt orientations
489 if (movementVector.X > 0)
490 {
491 // east
492 if (movementVector.Y > 0)
493 {
494 // northeast
495 movementVector.X = (float)Math.Sqrt(2.0);
496 movementVector.Y = (float)Math.Sqrt(2.0);
497 }
498 else
499 {
500 // southeast
501 movementVector.X = (float)Math.Sqrt(2.0);
502 movementVector.Y = -(float)Math.Sqrt(2.0);
503 }
504 }
505 else
506 {
507 // west
508 if (movementVector.Y > 0)
509 {
510 // northwest
511 movementVector.X = -(float)Math.Sqrt(2.0);
512 movementVector.Y = (float)Math.Sqrt(2.0);
513 }
514 else
515 {
516 // southwest
517 movementVector.X = -(float)Math.Sqrt(2.0);
518 movementVector.Y = -(float)Math.Sqrt(2.0);
519 }
520 }
521
522
523 // movementVector.Z is zero
524
525 // calculate tilt components based on desired amount of tilt and current (snapped) heading.
526 // the "-" sign is to force the tilt to be OPPOSITE the direction of movement.
527 float xTiltComponent = -movementVector.X * m_tiltMagnitudeWhenProjectedOnXYPlane;
528 float yTiltComponent = -movementVector.Y * m_tiltMagnitudeWhenProjectedOnXYPlane;
529
530 //m_log.Debug("[PHYSICS] changing avatar tilt");
531 d.JointSetAMotorParam(Amotor, (int)dParam.LowStop, xTiltComponent);
532 d.JointSetAMotorParam(Amotor, (int)dParam.HiStop, xTiltComponent); // must be same as lowstop, else a different, spurious tilt is introduced
533 d.JointSetAMotorParam(Amotor, (int)dParam.LoStop2, yTiltComponent);
534 d.JointSetAMotorParam(Amotor, (int)dParam.HiStop2, yTiltComponent); // same as lowstop
535 d.JointSetAMotorParam(Amotor, (int)dParam.LoStop3, 0f);
536 d.JointSetAMotorParam(Amotor, (int)dParam.HiStop3, 0f); // same as lowstop
537 }
538
539 /// <summary>
540 /// This creates the Avatar's physical Surrogate at the position supplied
541 /// </summary>
542 /// <param name="npositionX"></param>
543 /// <param name="npositionY"></param>
544 /// <param name="npositionZ"></param>
545
546 // WARNING: This MUST NOT be called outside of ProcessTaints, else we can have unsynchronized access
547 // to ODE internals. ProcessTaints is called from within thread-locked Simulate(), so it is the only
548 // place that is safe to call this routine AvatarGeomAndBodyCreation.
549 private void AvatarGeomAndBodyCreation(float npositionX, float npositionY, float npositionZ, float tensor)
550 {
551 //CAPSULE_LENGTH = -5;
552 //CAPSULE_RADIUS = -5;
553 int dAMotorEuler = 1;
554 _parent_scene.waitForSpaceUnlock(_parent_scene.space);
555 if (CAPSULE_LENGTH <= 0)
556 {
557 m_log.Warn("[PHYSICS]: The capsule size you specified in opensim.ini is invalid! Setting it to the smallest possible size!");
558 CAPSULE_LENGTH = 0.01f;
559
560 }
561
562 if (CAPSULE_RADIUS <= 0)
563 {
564 m_log.Warn("[PHYSICS]: The capsule size you specified in opensim.ini is invalid! Setting it to the smallest possible size!");
565 CAPSULE_RADIUS = 0.01f;
566
567 }
568 Shell = d.CreateCapsule(_parent_scene.space, CAPSULE_RADIUS, CAPSULE_LENGTH);
569
570 d.GeomSetCategoryBits(Shell, (int)m_collisionCategories);
571 d.GeomSetCollideBits(Shell, (int)m_collisionFlags);
572
573 d.MassSetCapsuleTotal(out ShellMass, m_mass, 2, CAPSULE_RADIUS, CAPSULE_LENGTH);
574 Body = d.BodyCreate(_parent_scene.world);
575 d.BodySetPosition(Body, npositionX, npositionY, npositionZ);
576
577 _position.X = npositionX;
578 _position.Y = npositionY;
579 _position.Z = npositionZ;
580
581
582 m_taintPosition.X = npositionX;
583 m_taintPosition.Y = npositionY;
584 m_taintPosition.Z = npositionZ;
585
586 d.BodySetMass(Body, ref ShellMass);
587 d.Matrix3 m_caprot;
588 // 90 Stand up on the cap of the capped cyllinder
589 if (_parent_scene.IsAvCapsuleTilted)
590 {
591 d.RFromAxisAndAngle(out m_caprot, 1, 0, 1, (float)(Math.PI / 2));
592 }
593 else
594 {
595 d.RFromAxisAndAngle(out m_caprot, 0, 0, 1, (float)(Math.PI / 2));
596 }
597
598
599 d.GeomSetRotation(Shell, ref m_caprot);
600 d.BodySetRotation(Body, ref m_caprot);
601
602 d.GeomSetBody(Shell, Body);
603
604
605 // The purpose of the AMotor here is to keep the avatar's physical
606 // surrogate from rotating while moving
607 Amotor = d.JointCreateAMotor(_parent_scene.world, IntPtr.Zero);
608 d.JointAttach(Amotor, Body, IntPtr.Zero);
609 d.JointSetAMotorMode(Amotor, dAMotorEuler);
610 d.JointSetAMotorNumAxes(Amotor, 3);
611 d.JointSetAMotorAxis(Amotor, 0, 0, 1, 0, 0);
612 d.JointSetAMotorAxis(Amotor, 1, 0, 0, 1, 0);
613 d.JointSetAMotorAxis(Amotor, 2, 0, 0, 0, 1);
614 d.JointSetAMotorAngle(Amotor, 0, 0);
615 d.JointSetAMotorAngle(Amotor, 1, 0);
616 d.JointSetAMotorAngle(Amotor, 2, 0);
617
618 // These lowstops and high stops are effectively (no wiggle room)
619 if (_parent_scene.IsAvCapsuleTilted)
620 {
621 d.JointSetAMotorParam(Amotor, (int)dParam.LowStop, -0.000000000001f);
622 d.JointSetAMotorParam(Amotor, (int)dParam.LoStop3, -0.000000000001f);
623 d.JointSetAMotorParam(Amotor, (int)dParam.LoStop2, -0.000000000001f);
624 d.JointSetAMotorParam(Amotor, (int)dParam.HiStop, 0.000000000001f);
625 d.JointSetAMotorParam(Amotor, (int)dParam.HiStop3, 0.000000000001f);
626 d.JointSetAMotorParam(Amotor, (int)dParam.HiStop2, 0.000000000001f);
627 }
628 else
629 {
630 #region Documentation of capsule motor LowStop and HighStop parameters
631 // Intentionally introduce some tilt into the capsule by setting
632 // the motor stops to small epsilon values. This small tilt prevents
633 // the capsule from falling into the terrain; a straight-up capsule
634 // (with -0..0 motor stops) falls into the terrain for reasons yet
635 // to be comprehended in their entirety.
636 #endregion
637 AlignAvatarTiltWithCurrentDirectionOfMovement(Vector3.Zero);
638 d.JointSetAMotorParam(Amotor, (int)dParam.LowStop, 0.08f);
639 d.JointSetAMotorParam(Amotor, (int)dParam.LoStop3, -0f);
640 d.JointSetAMotorParam(Amotor, (int)dParam.LoStop2, 0.08f);
641 d.JointSetAMotorParam(Amotor, (int)dParam.HiStop, 0.08f); // must be same as lowstop, else a different, spurious tilt is introduced
642 d.JointSetAMotorParam(Amotor, (int)dParam.HiStop3, 0f); // same as lowstop
643 d.JointSetAMotorParam(Amotor, (int)dParam.HiStop2, 0.08f); // same as lowstop
644 }
645
646 // Fudge factor is 1f by default, we're setting it to 0. We don't want it to Fudge or the
647 // capped cyllinder will fall over
648 d.JointSetAMotorParam(Amotor, (int)dParam.FudgeFactor, 0f);
649 d.JointSetAMotorParam(Amotor, (int)dParam.FMax, tensor);
650
651 //d.Matrix3 bodyrotation = d.BodyGetRotation(Body);
652 //d.QfromR(
653 //d.Matrix3 checkrotation = new d.Matrix3(0.7071068,0.5, -0.7071068,
654 //
655 //m_log.Info("[PHYSICSAV]: Rotation: " + bodyrotation.M00 + " : " + bodyrotation.M01 + " : " + bodyrotation.M02 + " : " + bodyrotation.M10 + " : " + bodyrotation.M11 + " : " + bodyrotation.M12 + " : " + bodyrotation.M20 + " : " + bodyrotation.M21 + " : " + bodyrotation.M22);
656 //standupStraight();
657 }
658
659 //
660 /// <summary>
661 /// Uses the capped cyllinder volume formula to calculate the avatar's mass.
662 /// This may be used in calculations in the scene/scenepresence
663 /// </summary>
664 public override float Mass
665 {
666 get
667 {
668 float AVvolume = (float) (Math.PI*Math.Pow(CAPSULE_RADIUS, 2)*CAPSULE_LENGTH);
669 return m_density*AVvolume;
670 }
671 }
672 public override void link(PhysicsActor obj)
673 {
674
675 }
676
677 public override void delink()
678 {
679
680 }
681
682 public override void LockAngularMotion(Vector3 axis)
683 {
684
685 }
686
687// This code is very useful. Written by DanX0r. We're just not using it right now.
688// Commented out to prevent a warning.
689//
690// private void standupStraight()
691// {
692// // The purpose of this routine here is to quickly stabilize the Body while it's popped up in the air.
693// // The amotor needs a few seconds to stabilize so without it, the avatar shoots up sky high when you
694// // change appearance and when you enter the simulator
695// // After this routine is done, the amotor stabilizes much quicker
696// d.Vector3 feet;
697// d.Vector3 head;
698// d.BodyGetRelPointPos(Body, 0.0f, 0.0f, -1.0f, out feet);
699// d.BodyGetRelPointPos(Body, 0.0f, 0.0f, 1.0f, out head);
700// float posture = head.Z - feet.Z;
701
702// // restoring force proportional to lack of posture:
703// float servo = (2.5f - posture) * POSTURE_SERVO;
704// d.BodyAddForceAtRelPos(Body, 0.0f, 0.0f, servo, 0.0f, 0.0f, 1.0f);
705// d.BodyAddForceAtRelPos(Body, 0.0f, 0.0f, -servo, 0.0f, 0.0f, -1.0f);
706// //d.Matrix3 bodyrotation = d.BodyGetRotation(Body);
707// //m_log.Info("[PHYSICSAV]: Rotation: " + bodyrotation.M00 + " : " + bodyrotation.M01 + " : " + bodyrotation.M02 + " : " + bodyrotation.M10 + " : " + bodyrotation.M11 + " : " + bodyrotation.M12 + " : " + bodyrotation.M20 + " : " + bodyrotation.M21 + " : " + bodyrotation.M22);
708// }
709
710 public override Vector3 Force
711 {
712 get { return _target_velocity; }
713 set { return; }
714 }
715
716 public override int VehicleType
717 {
718 get { return 0; }
719 set { return; }
720 }
721
722 public override void VehicleFloatParam(int param, float value)
723 {
724
725 }
726
727 public override void VehicleVectorParam(int param, Vector3 value)
728 {
729
730 }
731
732 public override void VehicleRotationParam(int param, Quaternion rotation)
733 {
734
735 }
736
737 public override void VehicleFlags(int flags, bool remove)
738 {
739 }
740
741 public override void VehicleFlagsSet(int flags)
742 {
743
744 }
745
746 public override void VehicleFlagsRemove(int flags)
747 {
748
749 }
750
751 public override void SetVolumeDetect(int param)
752 {
753
754 }
755
756 public override Vector3 CenterOfMass
757 {
758 get { return Vector3.Zero; }
759 }
760
761 public override Vector3 GeometricCenter
762 {
763 get { return Vector3.Zero; }
764 }
765
766 public override PrimitiveBaseShape Shape
767 {
768 set { return; }
769 }
770
771 public override Vector3 Velocity
772 {
773 get {
774 // There's a problem with Vector3.Zero! Don't Use it Here!
775 if (_zeroFlag)
776 return Vector3.Zero;
777 m_lastUpdateSent = false;
778 return _velocity;
779 }
780 set
781 {
782 if (value.IsFinite())
783 {
784 m_pidControllerActive = true;
785 _target_velocity = value;
786 }
787 else
788 {
789 m_log.Warn("[PHYSICS]: Got a NaN velocity from Scene in a Character");
790 }
791 }
792 }
793
794 public override Vector3 Torque
795 {
796 get { return Vector3.Zero; }
797 set { return; }
798 }
799
800 public override float CollisionScore
801 {
802 get { return 0f; }
803 set { }
804 }
805
806 public override bool Kinematic
807 {
808 get { return false; }
809 set { }
810 }
811
812 public override Quaternion Orientation
813 {
814 get { return Quaternion.Identity; }
815 set {
816 //Matrix3 or = Orientation.ToRotationMatrix();
817 //d.Matrix3 ord = new d.Matrix3(or.m00, or.m10, or.m20, or.m01, or.m11, or.m21, or.m02, or.m12, or.m22);
818 //d.BodySetRotation(Body, ref ord);
819 }
820 }
821
822 public override Vector3 Acceleration
823 {
824 get { return _acceleration; }
825 }
826
827 public void SetAcceleration(Vector3 accel)
828 {
829 m_pidControllerActive = true;
830 _acceleration = accel;
831 }
832
833 /// <summary>
834 /// Adds the force supplied to the Target Velocity
835 /// The PID controller takes this target velocity and tries to make it a reality
836 /// </summary>
837 /// <param name="force"></param>
838 public override void AddForce(Vector3 force, bool pushforce)
839 {
840 if (force.IsFinite())
841 {
842 if (pushforce)
843 {
844 m_pidControllerActive = false;
845 force *= 100f;
846 doForce(force);
847 // If uncommented, things get pushed off world
848 //
849 // m_log.Debug("Push!");
850 // _target_velocity.X += force.X;
851 // _target_velocity.Y += force.Y;
852 // _target_velocity.Z += force.Z;
853 }
854 else
855 {
856 m_pidControllerActive = true;
857 _target_velocity.X += force.X;
858 _target_velocity.Y += force.Y;
859 _target_velocity.Z += force.Z;
860 }
861 }
862 else
863 {
864 m_log.Warn("[PHYSICS]: Got a NaN force applied to a Character");
865 }
866 //m_lastUpdateSent = false;
867 }
868
869 public override void AddAngularForce(Vector3 force, bool pushforce)
870 {
871
872 }
873
874 /// <summary>
875 /// After all of the forces add up with 'add force' we apply them with doForce
876 /// </summary>
877 /// <param name="force"></param>
878 public void doForce(Vector3 force)
879 {
880 if (!collidelock)
881 {
882 d.BodyAddForce(Body, force.X, force.Y, force.Z);
883 //d.BodySetRotation(Body, ref m_StandUpRotation);
884 //standupStraight();
885
886 }
887 }
888
889 public override void SetMomentum(Vector3 momentum)
890 {
891 }
892
893
894 /// <summary>
895 /// Called from Simulate
896 /// This is the avatar's movement control + PID Controller
897 /// </summary>
898 /// <param name="timeStep"></param>
899 public void Move(float timeStep, List<OdeCharacter> defects)
900 {
901 // no lock; for now it's only called from within Simulate()
902
903 // If the PID Controller isn't active then we set our force
904 // calculating base velocity to the current position
905
906 if (Body == IntPtr.Zero)
907 return;
908
909 if (m_pidControllerActive == false)
910 {
911 _zeroPosition = d.BodyGetPosition(Body);
912 }
913 //PidStatus = true;
914
915 d.Vector3 localpos = d.BodyGetPosition(Body);
916 Vector3 localPos = new Vector3(localpos.X, localpos.Y, localpos.Z);
917
918 if (!localPos.IsFinite())
919 {
920
921 m_log.Warn("[PHYSICS]: Avatar Position is non-finite!");
922 defects.Add(this);
923 // _parent_scene.RemoveCharacter(this);
924
925 // destroy avatar capsule and related ODE data
926 if (Amotor != IntPtr.Zero)
927 {
928 // Kill the Amotor
929 d.JointDestroy(Amotor);
930 Amotor = IntPtr.Zero;
931 }
932
933 //kill the Geometry
934 _parent_scene.waitForSpaceUnlock(_parent_scene.space);
935
936 if (Body != IntPtr.Zero)
937 {
938 //kill the body
939 d.BodyDestroy(Body);
940
941 Body = IntPtr.Zero;
942 }
943
944 if (Shell != IntPtr.Zero)
945 {
946 d.GeomDestroy(Shell);
947 _parent_scene.geom_name_map.Remove(Shell);
948 Shell = IntPtr.Zero;
949 }
950
951 return;
952 }
953
954 Vector3 vec = Vector3.Zero;
955 d.Vector3 vel = d.BodyGetLinearVel(Body);
956
957 float movementdivisor = 1f;
958
959 if (!m_alwaysRun)
960 {
961 movementdivisor = walkDivisor;
962 }
963 else
964 {
965 movementdivisor = runDivisor;
966 }
967
968 // if velocity is zero, use position control; otherwise, velocity control
969 if (_target_velocity.X == 0.0f && _target_velocity.Y == 0.0f && _target_velocity.Z == 0.0f && m_iscolliding)
970 {
971 // keep track of where we stopped. No more slippin' & slidin'
972 if (!_zeroFlag)
973 {
974 _zeroFlag = true;
975 _zeroPosition = d.BodyGetPosition(Body);
976 }
977 if (m_pidControllerActive)
978 {
979 // We only want to deactivate the PID Controller if we think we want to have our surrogate
980 // react to the physics scene by moving it's position.
981 // Avatar to Avatar collisions
982 // Prim to avatar collisions
983
984 d.Vector3 pos = d.BodyGetPosition(Body);
985 vec.X = (_target_velocity.X - vel.X) * (PID_D) + (_zeroPosition.X - pos.X) * (PID_P * 2);
986 vec.Y = (_target_velocity.Y - vel.Y)*(PID_D) + (_zeroPosition.Y - pos.Y)* (PID_P * 2);
987 if (flying)
988 {
989 vec.Z = (_target_velocity.Z - vel.Z) * (PID_D) + (_zeroPosition.Z - pos.Z) * PID_P;
990 }
991 }
992 //PidStatus = true;
993 }
994 else
995 {
996 m_pidControllerActive = true;
997 _zeroFlag = false;
998 if (m_iscolliding && !flying)
999 {
1000 // We're standing on something
1001 vec.X = ((_target_velocity.X / movementdivisor) - vel.X) * (PID_D);
1002 vec.Y = ((_target_velocity.Y / movementdivisor) - vel.Y) * (PID_D);
1003 }
1004 else if (m_iscolliding && flying)
1005 {
1006 // We're flying and colliding with something
1007 vec.X = ((_target_velocity.X/movementdivisor) - vel.X)*(PID_D / 16);
1008 vec.Y = ((_target_velocity.Y/movementdivisor) - vel.Y)*(PID_D / 16);
1009 }
1010 else if (!m_iscolliding && flying)
1011 {
1012 // we're in mid air suspended
1013 vec.X = ((_target_velocity.X / movementdivisor) - vel.X) * (PID_D/6);
1014 vec.Y = ((_target_velocity.Y / movementdivisor) - vel.Y) * (PID_D/6);
1015 }
1016
1017 if (m_iscolliding && !flying && _target_velocity.Z > 0.0f)
1018 {
1019 // We're colliding with something and we're not flying but we're moving
1020 // This means we're walking or running.
1021 d.Vector3 pos = d.BodyGetPosition(Body);
1022 vec.Z = (_target_velocity.Z - vel.Z)*PID_D + (_zeroPosition.Z - pos.Z)*PID_P;
1023 if (_target_velocity.X > 0)
1024 {
1025 vec.X = ((_target_velocity.X - vel.X)/1.2f)*PID_D;
1026 }
1027 if (_target_velocity.Y > 0)
1028 {
1029 vec.Y = ((_target_velocity.Y - vel.Y)/1.2f)*PID_D;
1030 }
1031 }
1032 else if (!m_iscolliding && !flying)
1033 {
1034 // we're not colliding and we're not flying so that means we're falling!
1035 // m_iscolliding includes collisions with the ground.
1036
1037 // d.Vector3 pos = d.BodyGetPosition(Body);
1038 if (_target_velocity.X > 0)
1039 {
1040 vec.X = ((_target_velocity.X - vel.X)/1.2f)*PID_D;
1041 }
1042 if (_target_velocity.Y > 0)
1043 {
1044 vec.Y = ((_target_velocity.Y - vel.Y)/1.2f)*PID_D;
1045 }
1046 }
1047
1048 if (flying)
1049 {
1050 vec.Z = (_target_velocity.Z - vel.Z) * (PID_D);
1051 }
1052 }
1053 if (flying)
1054 {
1055 vec.Z += ((-1 * _parent_scene.gravityz)*m_mass);
1056
1057 //Added for auto fly height. Kitto Flora
1058 //d.Vector3 pos = d.BodyGetPosition(Body);
1059 float target_altitude = _parent_scene.GetTerrainHeightAtXY(_position.X, _position.Y) + MinimumGroundFlightOffset;
1060
1061 if (_position.Z < target_altitude)
1062 {
1063 vec.Z += (target_altitude - _position.Z) * PID_P * 5.0f;
1064 }
1065 // end add Kitto Flora
1066 }
1067 if (vec.IsFinite())
1068 {
1069 doForce(vec);
1070 if (!_zeroFlag)
1071 {
1072 AlignAvatarTiltWithCurrentDirectionOfMovement(vec);
1073 }
1074 }
1075 else
1076 {
1077 m_log.Warn("[PHYSICS]: Got a NaN force vector in Move()");
1078 m_log.Warn("[PHYSICS]: Avatar Position is non-finite!");
1079 defects.Add(this);
1080 // _parent_scene.RemoveCharacter(this);
1081 // destroy avatar capsule and related ODE data
1082 if (Amotor != IntPtr.Zero)
1083 {
1084 // Kill the Amotor
1085 d.JointDestroy(Amotor);
1086 Amotor = IntPtr.Zero;
1087 }
1088 //kill the Geometry
1089 _parent_scene.waitForSpaceUnlock(_parent_scene.space);
1090
1091 if (Body != IntPtr.Zero)
1092 {
1093 //kill the body
1094 d.BodyDestroy(Body);
1095
1096 Body = IntPtr.Zero;
1097 }
1098
1099 if (Shell != IntPtr.Zero)
1100 {
1101 d.GeomDestroy(Shell);
1102 _parent_scene.geom_name_map.Remove(Shell);
1103 Shell = IntPtr.Zero;
1104 }
1105 }
1106 }
1107
1108 /// <summary>
1109 /// Updates the reported position and velocity. This essentially sends the data up to ScenePresence.
1110 /// </summary>
1111 public void UpdatePositionAndVelocity()
1112 {
1113 // no lock; called from Simulate() -- if you call this from elsewhere, gotta lock or do Monitor.Enter/Exit!
1114 d.Vector3 vec;
1115 try
1116 {
1117 vec = d.BodyGetPosition(Body);
1118 }
1119 catch (NullReferenceException)
1120 {
1121 bad = true;
1122 _parent_scene.BadCharacter(this);
1123 vec = new d.Vector3(_position.X, _position.Y, _position.Z);
1124 base.RaiseOutOfBounds(_position); // Tells ScenePresence that there's a problem!
1125 m_log.WarnFormat("[ODEPLUGIN]: Avatar Null reference for Avatar {0}, physical actor {1}", m_name, m_uuid);
1126 }
1127
1128
1129 // kluge to keep things in bounds. ODE lets dead avatars drift away (they should be removed!)
1130 if (vec.X < 0.0f) vec.X = 0.0f;
1131 if (vec.Y < 0.0f) vec.Y = 0.0f;
1132 if (vec.X > (int)_parent_scene.WorldExtents.X - 0.05f) vec.X = (int)_parent_scene.WorldExtents.X - 0.05f;
1133 if (vec.Y > (int)_parent_scene.WorldExtents.Y - 0.05f) vec.Y = (int)_parent_scene.WorldExtents.Y - 0.05f;
1134
1135 _position.X = vec.X;
1136 _position.Y = vec.Y;
1137 _position.Z = vec.Z;
1138
1139 // Did we move last? = zeroflag
1140 // This helps keep us from sliding all over
1141
1142 if (_zeroFlag)
1143 {
1144 _velocity.X = 0.0f;
1145 _velocity.Y = 0.0f;
1146 _velocity.Z = 0.0f;
1147
1148 // Did we send out the 'stopped' message?
1149 if (!m_lastUpdateSent)
1150 {
1151 m_lastUpdateSent = true;
1152 //base.RequestPhysicsterseUpdate();
1153
1154 }
1155 }
1156 else
1157 {
1158 m_lastUpdateSent = false;
1159 try
1160 {
1161 vec = d.BodyGetLinearVel(Body);
1162 }
1163 catch (NullReferenceException)
1164 {
1165 vec.X = _velocity.X;
1166 vec.Y = _velocity.Y;
1167 vec.Z = _velocity.Z;
1168 }
1169 _velocity.X = (vec.X);
1170 _velocity.Y = (vec.Y);
1171
1172 _velocity.Z = (vec.Z);
1173
1174 if (_velocity.Z < -6 && !m_hackSentFall)
1175 {
1176 m_hackSentFall = true;
1177 m_pidControllerActive = false;
1178 }
1179 else if (flying && !m_hackSentFly)
1180 {
1181 //m_hackSentFly = true;
1182 //base.SendCollisionUpdate(new CollisionEventUpdate());
1183 }
1184 else
1185 {
1186 m_hackSentFly = false;
1187 m_hackSentFall = false;
1188 }
1189 }
1190 }
1191
1192 /// <summary>
1193 /// Cleanup the things we use in the scene.
1194 /// </summary>
1195 public void Destroy()
1196 {
1197 m_tainted_isPhysical = false;
1198 _parent_scene.AddPhysicsActorTaint(this);
1199 }
1200
1201 public override void CrossingFailure()
1202 {
1203 }
1204
1205 public override Vector3 PIDTarget { set { return; } }
1206 public override bool PIDActive { set { return; } }
1207 public override float PIDTau { set { return; } }
1208
1209 public override float PIDHoverHeight { set { return; } }
1210 public override bool PIDHoverActive { set { return; } }
1211 public override PIDHoverType PIDHoverType { set { return; } }
1212 public override float PIDHoverTau { set { return; } }
1213
1214 public override Quaternion APIDTarget{ set { return; } }
1215
1216 public override bool APIDActive{ set { return; } }
1217
1218 public override float APIDStrength{ set { return; } }
1219
1220 public override float APIDDamping{ set { return; } }
1221
1222
1223 public override void SubscribeEvents(int ms)
1224 {
1225 m_requestedUpdateFrequency = ms;
1226 m_eventsubscription = ms;
1227 _parent_scene.addCollisionEventReporting(this);
1228 }
1229 public override void UnSubscribeEvents()
1230 {
1231 _parent_scene.remCollisionEventReporting(this);
1232 m_requestedUpdateFrequency = 0;
1233 m_eventsubscription = 0;
1234 }
1235 public void AddCollisionEvent(uint CollidedWith, ContactPoint contact)
1236 {
1237 if (m_eventsubscription > 0)
1238 {
1239 CollisionEventsThisFrame.addCollider(CollidedWith, contact);
1240 }
1241 }
1242
1243 public void SendCollisions()
1244 {
1245 if (m_eventsubscription > m_requestedUpdateFrequency)
1246 {
1247 if (CollisionEventsThisFrame != null)
1248 {
1249 base.SendCollisionUpdate(CollisionEventsThisFrame);
1250 }
1251 CollisionEventsThisFrame = new CollisionEventUpdate();
1252 m_eventsubscription = 0;
1253 }
1254 }
1255 public override bool SubscribedEvents()
1256 {
1257 if (m_eventsubscription > 0)
1258 return true;
1259 return false;
1260 }
1261
1262 public void ProcessTaints(float timestep)
1263 {
1264
1265 if (m_tainted_isPhysical != m_isPhysical)
1266 {
1267 if (m_tainted_isPhysical)
1268 {
1269 // Create avatar capsule and related ODE data
1270 if (!(Shell == IntPtr.Zero && Body == IntPtr.Zero && Amotor == IntPtr.Zero))
1271 {
1272 m_log.Warn("[PHYSICS]: re-creating the following avatar ODE data, even though it already exists - "
1273 + (Shell!=IntPtr.Zero ? "Shell ":"")
1274 + (Body!=IntPtr.Zero ? "Body ":"")
1275 + (Amotor!=IntPtr.Zero ? "Amotor ":""));
1276 }
1277 AvatarGeomAndBodyCreation(_position.X, _position.Y, _position.Z, m_tensor);
1278
1279 _parent_scene.geom_name_map[Shell] = m_name;
1280 _parent_scene.actor_name_map[Shell] = (PhysicsActor)this;
1281 _parent_scene.AddCharacter(this);
1282 }
1283 else
1284 {
1285 _parent_scene.RemoveCharacter(this);
1286 // destroy avatar capsule and related ODE data
1287 if (Amotor != IntPtr.Zero)
1288 {
1289 // Kill the Amotor
1290 d.JointDestroy(Amotor);
1291 Amotor = IntPtr.Zero;
1292 }
1293 //kill the Geometry
1294 _parent_scene.waitForSpaceUnlock(_parent_scene.space);
1295
1296 if (Body != IntPtr.Zero)
1297 {
1298 //kill the body
1299 d.BodyDestroy(Body);
1300
1301 Body = IntPtr.Zero;
1302 }
1303
1304 if (Shell != IntPtr.Zero)
1305 {
1306 d.GeomDestroy(Shell);
1307 _parent_scene.geom_name_map.Remove(Shell);
1308 Shell = IntPtr.Zero;
1309 }
1310
1311 }
1312
1313 m_isPhysical = m_tainted_isPhysical;
1314 }
1315
1316 if (m_tainted_CAPSULE_LENGTH != CAPSULE_LENGTH)
1317 {
1318 if (Shell != IntPtr.Zero && Body != IntPtr.Zero && Amotor != IntPtr.Zero)
1319 {
1320
1321 m_pidControllerActive = true;
1322 // no lock needed on _parent_scene.OdeLock because we are called from within the thread lock in OdePlugin's simulate()
1323 d.JointDestroy(Amotor);
1324 float prevCapsule = CAPSULE_LENGTH;
1325 CAPSULE_LENGTH = m_tainted_CAPSULE_LENGTH;
1326 //m_log.Info("[SIZE]: " + CAPSULE_LENGTH.ToString());
1327 d.BodyDestroy(Body);
1328 d.GeomDestroy(Shell);
1329 AvatarGeomAndBodyCreation(_position.X, _position.Y,
1330 _position.Z + (Math.Abs(CAPSULE_LENGTH - prevCapsule) * 2), m_tensor);
1331 Velocity = Vector3.Zero;
1332
1333 _parent_scene.geom_name_map[Shell] = m_name;
1334 _parent_scene.actor_name_map[Shell] = (PhysicsActor)this;
1335 }
1336 else
1337 {
1338 m_log.Warn("[PHYSICS]: trying to change capsule size, but the following ODE data is missing - "
1339 + (Shell==IntPtr.Zero ? "Shell ":"")
1340 + (Body==IntPtr.Zero ? "Body ":"")
1341 + (Amotor==IntPtr.Zero ? "Amotor ":""));
1342 }
1343 }
1344
1345 if (!m_taintPosition.ApproxEquals(_position, 0.05f))
1346 {
1347 if (Body != IntPtr.Zero)
1348 {
1349 d.BodySetPosition(Body, m_taintPosition.X, m_taintPosition.Y, m_taintPosition.Z);
1350
1351 _position.X = m_taintPosition.X;
1352 _position.Y = m_taintPosition.Y;
1353 _position.Z = m_taintPosition.Z;
1354 }
1355 }
1356
1357 }
1358
1359 internal void AddCollisionFrameTime(int p)
1360 {
1361 // protect it from overflow crashing
1362 if (m_eventsubscription + p >= int.MaxValue)
1363 m_eventsubscription = 0;
1364 m_eventsubscription += p;
1365 }
1366 }
1367}
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODEDynamics.c_comments b/OpenSim/Region/Physics/ChOdePlugin/ODEDynamics.c_comments
new file mode 100644
index 0000000..1060aa6
--- /dev/null
+++ b/OpenSim/Region/Physics/ChOdePlugin/ODEDynamics.c_comments
@@ -0,0 +1,630 @@
1/*
2 * Revised August 26 2009 by Kitto Flora. ODEDynamics.cs replaces
3 * ODEVehicleSettings.cs. It and ODEPrim.cs are re-organised:
4 * ODEPrim.cs contains methods dealing with Prim editing, Prim
5 * characteristics and Kinetic motion.
6 * ODEDynamics.cs contains methods dealing with Prim Physical motion
7 * (dynamics) and the associated settings. Old Linear and angular
8 * motors for dynamic motion have been replace with MoveLinear()
9 * and MoveAngular(); 'Physical' is used only to switch ODE dynamic
10 * simualtion on/off; VEHICAL_TYPE_NONE/VEHICAL_TYPE_<other> is to
11 * switch between 'VEHICLE' parameter use and general dynamics
12 * settings use.
13 *
14 * Copyright (c) Contributors, http://opensimulator.org/
15 * See CONTRIBUTORS.TXT for a full list of copyright holders.
16 *
17 * Redistribution and use in source and binary forms, with or without
18 * modification, are permitted provided that the following conditions are met:
19 * * Redistributions of source code must retain the above copyright
20 * notice, this list of conditions and the following disclaimer.
21 * * Redistributions in binary form must reproduce the above copyright
22 * notice, this list of conditions and the following disclaimer in the
23 * documentation and/or other materials provided with the distribution.
24 * * Neither the name of the OpenSimulator Project nor the
25 * names of its contributors may be used to endorse or promote products
26 * derived from this software without specific prior written permission.
27 *
28 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
29 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
30 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
31 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
32 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
33 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
34 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
35 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
36 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
37 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
38 */
39
40using System;
41using System.Collections.Generic;
42using System.Reflection;
43using System.Runtime.InteropServices;
44using log4net;
45using OpenMetaverse;
46using Ode.NET;
47using OpenSim.Framework;
48using OpenSim.Region.Physics.Manager;
49
50namespace OpenSim.Region.Physics.OdePlugin
51{
52 public class ODEDynamics
53 {
54 public Vehicle Type
55 {
56 get { return m_type; }
57 }
58
59 public IntPtr Body
60 {
61 get { return m_body; }
62 }
63
64 private int frcount = 0; // Used to limit dynamics debug output to
65 // every 100th frame
66
67 // private OdeScene m_parentScene = null;
68 private IntPtr m_body = IntPtr.Zero;
69 private IntPtr m_jointGroup = IntPtr.Zero;
70 private IntPtr m_aMotor = IntPtr.Zero;
71
72
73 // Vehicle properties
74 private Vehicle m_type = Vehicle.TYPE_NONE; // If a 'VEHICLE', and what kind
75 // private Quaternion m_referenceFrame = Quaternion.Identity; // Axis modifier
76 private VehicleFlag m_flags = (VehicleFlag) 0; // Boolean settings:
77 // HOVER_TERRAIN_ONLY
78 // HOVER_GLOBAL_HEIGHT
79 // NO_DEFLECTION_UP
80 // HOVER_WATER_ONLY
81 // HOVER_UP_ONLY
82 // LIMIT_MOTOR_UP
83 // LIMIT_ROLL_ONLY
84
85 // Linear properties
86 private Vector3 m_linearMotorDirection = Vector3.Zero; // velocity requested by LSL, decayed by time
87 private Vector3 m_linearMotorDirectionLASTSET = Vector3.Zero; // velocity requested by LSL
88 private Vector3 m_dir = Vector3.Zero; // velocity applied to body
89 private Vector3 m_linearFrictionTimescale = Vector3.Zero;
90 private float m_linearMotorDecayTimescale = 0;
91 private float m_linearMotorTimescale = 0;
92 private Vector3 m_lastLinearVelocityVector = Vector3.Zero;
93 // private bool m_LinearMotorSetLastFrame = false;
94 // private Vector3 m_linearMotorOffset = Vector3.Zero;
95
96 //Angular properties
97 private Vector3 m_angularMotorDirection = Vector3.Zero;
98 private Vector3 m_angularMotorDirectionLASTSET = Vector3.Zero;
99 private Vector3 m_angularFrictionTimescale = Vector3.Zero;
100 private float m_angularMotorDecayTimescale = 0;
101 private float m_angularMotorTimescale = 0;
102 private Vector3 m_lastAngularVelocityVector = Vector3.Zero;
103
104 //Deflection properties
105 // private float m_angularDeflectionEfficiency = 0;
106 // private float m_angularDeflectionTimescale = 0;
107 // private float m_linearDeflectionEfficiency = 0;
108 // private float m_linearDeflectionTimescale = 0;
109
110 //Banking properties
111 // private float m_bankingEfficiency = 0;
112 // private float m_bankingMix = 0;
113 // private float m_bankingTimescale = 0;
114
115 //Hover and Buoyancy properties
116 private float m_VhoverHeight = 0f;
117 private float m_VhoverEfficiency = 0f;
118 private float m_VhoverTimescale = 0f;
119 private float m_VhoverTargetHeight = -1.0f; // if <0 then no hover, else its the current target height
120 private float m_VehicleBuoyancy = 0f; //KF: m_VehicleBuoyancy is set by VEHICLE_BUOYANCY for a vehicle.
121 // Modifies gravity. Slider between -1 (double-gravity) and 1 (full anti-gravity)
122 // KF: So far I have found no good method to combine a script-requested .Z velocity and gravity.
123 // Therefore only m_VehicleBuoyancy=1 (0g) will use the script-requested .Z velocity.
124
125 //Attractor properties
126 private float m_verticalAttractionEfficiency = 0;
127 private float m_verticalAttractionTimescale = 0;
128
129
130
131
132
133 internal void ProcessFloatVehicleParam(Vehicle pParam, float pValue)
134 {
135 switch (pParam)
136 {
137 case Vehicle.ANGULAR_DEFLECTION_EFFICIENCY:
138 if (pValue < 0.01f) pValue = 0.01f;
139 // m_angularDeflectionEfficiency = pValue;
140 break;
141 case Vehicle.ANGULAR_DEFLECTION_TIMESCALE:
142 if (pValue < 0.01f) pValue = 0.01f;
143 // m_angularDeflectionTimescale = pValue;
144 break;
145 case Vehicle.ANGULAR_MOTOR_DECAY_TIMESCALE:
146 if (pValue < 0.01f) pValue = 0.01f;
147 m_angularMotorDecayTimescale = pValue;
148 break;
149 case Vehicle.ANGULAR_MOTOR_TIMESCALE:
150 if (pValue < 0.01f) pValue = 0.01f;
151 m_angularMotorTimescale = pValue;
152 break;
153 case Vehicle.BANKING_EFFICIENCY:
154 if (pValue < 0.01f) pValue = 0.01f;
155 // m_bankingEfficiency = pValue;
156 break;
157 case Vehicle.BANKING_MIX:
158 if (pValue < 0.01f) pValue = 0.01f;
159 // m_bankingMix = pValue;
160 break;
161 case Vehicle.BANKING_TIMESCALE:
162 if (pValue < 0.01f) pValue = 0.01f;
163 // m_bankingTimescale = pValue;
164 break;
165 case Vehicle.BUOYANCY:
166 if (pValue < -1f) pValue = -1f;
167 if (pValue > 1f) pValue = 1f;
168 m_VehicleBuoyancy = pValue;
169 break;
170 case Vehicle.HOVER_EFFICIENCY:
171 if (pValue < 0f) pValue = 0f;
172 if (pValue > 1f) pValue = 1f;
173 m_VhoverEfficiency = pValue;
174 break;
175 case Vehicle.HOVER_HEIGHT:
176 m_VhoverHeight = pValue;
177 break;
178 case Vehicle.HOVER_TIMESCALE:
179 if (pValue < 0.01f) pValue = 0.01f;
180 m_VhoverTimescale = pValue;
181 break;
182 case Vehicle.LINEAR_DEFLECTION_EFFICIENCY:
183 if (pValue < 0.01f) pValue = 0.01f;
184 // m_linearDeflectionEfficiency = pValue;
185 break;
186 case Vehicle.LINEAR_DEFLECTION_TIMESCALE:
187 if (pValue < 0.01f) pValue = 0.01f;
188 // m_linearDeflectionTimescale = pValue;
189 break;
190 case Vehicle.LINEAR_MOTOR_DECAY_TIMESCALE:
191 if (pValue < 0.01f) pValue = 0.01f;
192 m_linearMotorDecayTimescale = pValue;
193 break;
194 case Vehicle.LINEAR_MOTOR_TIMESCALE:
195 if (pValue < 0.01f) pValue = 0.01f;
196 m_linearMotorTimescale = pValue;
197 break;
198 case Vehicle.VERTICAL_ATTRACTION_EFFICIENCY:
199 if (pValue < 0.0f) pValue = 0.0f;
200 if (pValue > 1.0f) pValue = 1.0f;
201 m_verticalAttractionEfficiency = pValue;
202 break;
203 case Vehicle.VERTICAL_ATTRACTION_TIMESCALE:
204 if (pValue < 0.01f) pValue = 0.01f;
205 m_verticalAttractionTimescale = pValue;
206 break;
207
208 // These are vector properties but the engine lets you use a single float value to
209 // set all of the components to the same value
210 case Vehicle.ANGULAR_FRICTION_TIMESCALE:
211 m_angularFrictionTimescale = new Vector3(pValue, pValue, pValue);
212 break;
213 case Vehicle.ANGULAR_MOTOR_DIRECTION:
214 m_angularMotorDirection = new Vector3(pValue, pValue, pValue);
215 m_angularMotorDirectionLASTSET = new Vector3(pValue, pValue, pValue);
216 break;
217 case Vehicle.LINEAR_FRICTION_TIMESCALE:
218 m_linearFrictionTimescale = new Vector3(pValue, pValue, pValue);
219 break;
220 case Vehicle.LINEAR_MOTOR_DIRECTION:
221 m_linearMotorDirection = new Vector3(pValue, pValue, pValue);
222 m_linearMotorDirectionLASTSET = new Vector3(pValue, pValue, pValue);
223 break;
224 case Vehicle.LINEAR_MOTOR_OFFSET:
225 // m_linearMotorOffset = new Vector3(pValue, pValue, pValue);
226 break;
227
228 }
229
230 }//end ProcessFloatVehicleParam
231
232 internal void ProcessVectorVehicleParam(Vehicle pParam, PhysicsVector pValue)
233 {
234 switch (pParam)
235 {
236 case Vehicle.ANGULAR_FRICTION_TIMESCALE:
237 m_angularFrictionTimescale = new Vector3(pValue.X, pValue.Y, pValue.Z);
238 break;
239 case Vehicle.ANGULAR_MOTOR_DIRECTION:
240 m_angularMotorDirection = new Vector3(pValue.X, pValue.Y, pValue.Z);
241 m_angularMotorDirectionLASTSET = new Vector3(pValue.X, pValue.Y, pValue.Z);
242 break;
243 case Vehicle.LINEAR_FRICTION_TIMESCALE:
244 m_linearFrictionTimescale = new Vector3(pValue.X, pValue.Y, pValue.Z);
245 break;
246 case Vehicle.LINEAR_MOTOR_DIRECTION:
247 m_linearMotorDirection = new Vector3(pValue.X, pValue.Y, pValue.Z);
248 m_linearMotorDirectionLASTSET = new Vector3(pValue.X, pValue.Y, pValue.Z);
249 break;
250 case Vehicle.LINEAR_MOTOR_OFFSET:
251 // m_linearMotorOffset = new Vector3(pValue.X, pValue.Y, pValue.Z);
252 break;
253 }
254
255 }//end ProcessVectorVehicleParam
256
257 internal void ProcessRotationVehicleParam(Vehicle pParam, Quaternion pValue)
258 {
259 switch (pParam)
260 {
261 case Vehicle.REFERENCE_FRAME:
262 // m_referenceFrame = pValue;
263 break;
264 }
265
266 }//end ProcessRotationVehicleParam
267
268 internal void ProcessTypeChange(Vehicle pType)
269 {
270Console.WriteLine("ProcessTypeChange to " + pType);
271
272 // Set Defaults For Type
273 m_type = pType;
274 switch (pType)
275 {
276 case Vehicle.TYPE_SLED:
277 m_linearFrictionTimescale = new Vector3(30, 1, 1000);
278 m_angularFrictionTimescale = new Vector3(1000, 1000, 1000);
279 m_linearMotorDirection = Vector3.Zero;
280 m_linearMotorTimescale = 1000;
281 m_linearMotorDecayTimescale = 120;
282 m_angularMotorDirection = Vector3.Zero;
283 m_angularMotorTimescale = 1000;
284 m_angularMotorDecayTimescale = 120;
285 m_VhoverHeight = 0;
286 m_VhoverEfficiency = 1;
287 m_VhoverTimescale = 10;
288 m_VehicleBuoyancy = 0;
289 // m_linearDeflectionEfficiency = 1;
290 // m_linearDeflectionTimescale = 1;
291 // m_angularDeflectionEfficiency = 1;
292 // m_angularDeflectionTimescale = 1000;
293 // m_bankingEfficiency = 0;
294 // m_bankingMix = 1;
295 // m_bankingTimescale = 10;
296 // m_referenceFrame = Quaternion.Identity;
297 m_flags &=
298 ~(VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY |
299 VehicleFlag.HOVER_GLOBAL_HEIGHT | VehicleFlag.HOVER_UP_ONLY);
300 m_flags |= (VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.LIMIT_ROLL_ONLY | VehicleFlag.LIMIT_MOTOR_UP);
301 break;
302 case Vehicle.TYPE_CAR:
303 m_linearFrictionTimescale = new Vector3(100, 2, 1000);
304 m_angularFrictionTimescale = new Vector3(1000, 1000, 1000);
305 m_linearMotorDirection = Vector3.Zero;
306 m_linearMotorTimescale = 1;
307 m_linearMotorDecayTimescale = 60;
308 m_angularMotorDirection = Vector3.Zero;
309 m_angularMotorTimescale = 1;
310 m_angularMotorDecayTimescale = 0.8f;
311 m_VhoverHeight = 0;
312 m_VhoverEfficiency = 0;
313 m_VhoverTimescale = 1000;
314 m_VehicleBuoyancy = 0;
315 // // m_linearDeflectionEfficiency = 1;
316 // // m_linearDeflectionTimescale = 2;
317 // // m_angularDeflectionEfficiency = 0;
318 // m_angularDeflectionTimescale = 10;
319 m_verticalAttractionEfficiency = 1;
320 m_verticalAttractionTimescale = 10;
321 // m_bankingEfficiency = -0.2f;
322 // m_bankingMix = 1;
323 // m_bankingTimescale = 1;
324 // m_referenceFrame = Quaternion.Identity;
325 m_flags &= ~(VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.HOVER_GLOBAL_HEIGHT);
326 m_flags |= (VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.LIMIT_ROLL_ONLY | VehicleFlag.HOVER_UP_ONLY |
327 VehicleFlag.LIMIT_MOTOR_UP);
328 break;
329 case Vehicle.TYPE_BOAT:
330 m_linearFrictionTimescale = new Vector3(10, 3, 2);
331 m_angularFrictionTimescale = new Vector3(10,10,10);
332 m_linearMotorDirection = Vector3.Zero;
333 m_linearMotorTimescale = 5;
334 m_linearMotorDecayTimescale = 60;
335 m_angularMotorDirection = Vector3.Zero;
336 m_angularMotorTimescale = 4;
337 m_angularMotorDecayTimescale = 4;
338 m_VhoverHeight = 0;
339 m_VhoverEfficiency = 0.5f;
340 m_VhoverTimescale = 2;
341 m_VehicleBuoyancy = 1;
342 // m_linearDeflectionEfficiency = 0.5f;
343 // m_linearDeflectionTimescale = 3;
344 // m_angularDeflectionEfficiency = 0.5f;
345 // m_angularDeflectionTimescale = 5;
346 m_verticalAttractionEfficiency = 0.5f;
347 m_verticalAttractionTimescale = 5;
348 // m_bankingEfficiency = -0.3f;
349 // m_bankingMix = 0.8f;
350 // m_bankingTimescale = 1;
351 // m_referenceFrame = Quaternion.Identity;
352 m_flags &= ~(VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.LIMIT_ROLL_ONLY |
353 VehicleFlag.HOVER_GLOBAL_HEIGHT | VehicleFlag.HOVER_UP_ONLY);
354 m_flags |= (VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.HOVER_WATER_ONLY |
355 VehicleFlag.LIMIT_MOTOR_UP);
356 break;
357 case Vehicle.TYPE_AIRPLANE:
358 m_linearFrictionTimescale = new Vector3(200, 10, 5);
359 m_angularFrictionTimescale = new Vector3(20, 20, 20);
360 m_linearMotorDirection = Vector3.Zero;
361 m_linearMotorTimescale = 2;
362 m_linearMotorDecayTimescale = 60;
363 m_angularMotorDirection = Vector3.Zero;
364 m_angularMotorTimescale = 4;
365 m_angularMotorDecayTimescale = 4;
366 m_VhoverHeight = 0;
367 m_VhoverEfficiency = 0.5f;
368 m_VhoverTimescale = 1000;
369 m_VehicleBuoyancy = 0;
370 // m_linearDeflectionEfficiency = 0.5f;
371 // m_linearDeflectionTimescale = 3;
372 // m_angularDeflectionEfficiency = 1;
373 // m_angularDeflectionTimescale = 2;
374 m_verticalAttractionEfficiency = 0.9f;
375 m_verticalAttractionTimescale = 2;
376 // m_bankingEfficiency = 1;
377 // m_bankingMix = 0.7f;
378 // m_bankingTimescale = 2;
379 // m_referenceFrame = Quaternion.Identity;
380 m_flags &= ~(VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY |
381 VehicleFlag.HOVER_GLOBAL_HEIGHT | VehicleFlag.HOVER_UP_ONLY | VehicleFlag.LIMIT_MOTOR_UP);
382 m_flags |= (VehicleFlag.LIMIT_ROLL_ONLY);
383 break;
384 case Vehicle.TYPE_BALLOON:
385 m_linearFrictionTimescale = new Vector3(5, 5, 5);
386 m_angularFrictionTimescale = new Vector3(10, 10, 10);
387 m_linearMotorDirection = Vector3.Zero;
388 m_linearMotorTimescale = 5;
389 m_linearMotorDecayTimescale = 60;
390 m_angularMotorDirection = Vector3.Zero;
391 m_angularMotorTimescale = 6;
392 m_angularMotorDecayTimescale = 10;
393 m_VhoverHeight = 5;
394 m_VhoverEfficiency = 0.8f;
395 m_VhoverTimescale = 10;
396 m_VehicleBuoyancy = 1;
397 // m_linearDeflectionEfficiency = 0;
398 // m_linearDeflectionTimescale = 5;
399 // m_angularDeflectionEfficiency = 0;
400 // m_angularDeflectionTimescale = 5;
401 m_verticalAttractionEfficiency = 1;
402 m_verticalAttractionTimescale = 1000;
403 // m_bankingEfficiency = 0;
404 // m_bankingMix = 0.7f;
405 // m_bankingTimescale = 5;
406 // m_referenceFrame = Quaternion.Identity;
407 m_flags &= ~(VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY |
408 VehicleFlag.HOVER_UP_ONLY | VehicleFlag.LIMIT_MOTOR_UP);
409 m_flags |= (VehicleFlag.LIMIT_ROLL_ONLY | VehicleFlag.HOVER_GLOBAL_HEIGHT);
410 break;
411
412 }
413 }//end SetDefaultsForType
414
415 internal void Enable(IntPtr pBody, OdeScene pParentScene)
416 {
417//Console.WriteLine("Enable m_type=" + m_type + " m_VehicleBuoyancy=" + m_VehicleBuoyancy);
418 if (m_type == Vehicle.TYPE_NONE)
419 return;
420
421 m_body = pBody;
422 //KF: This used to set up the linear and angular joints
423 }
424
425 internal void Step(float pTimestep, OdeScene pParentScene)
426 {
427 if (m_body == IntPtr.Zero || m_type == Vehicle.TYPE_NONE)
428 return;
429 frcount++; // used to limit debug comment output
430 if (frcount > 100)
431 frcount = 0;
432
433 MoveLinear(pTimestep, pParentScene);
434 MoveAngular(pTimestep);
435 }// end Step
436
437 private void MoveLinear(float pTimestep, OdeScene _pParentScene)
438 {
439 if (!m_linearMotorDirection.ApproxEquals(Vector3.Zero, 0.01f)) // requested m_linearMotorDirection is significant
440 {
441 if(!d.BodyIsEnabled (Body)) d.BodyEnable (Body);
442
443 // add drive to body
444 Vector3 addAmount = m_linearMotorDirection/(m_linearMotorTimescale/pTimestep);
445 m_lastLinearVelocityVector += (addAmount*10); // lastLinearVelocityVector is the current body velocity vector?
446
447 // This will work temporarily, but we really need to compare speed on an axis
448 // KF: Limit body velocity to applied velocity?
449 if (Math.Abs(m_lastLinearVelocityVector.X) > Math.Abs(m_linearMotorDirectionLASTSET.X))
450 m_lastLinearVelocityVector.X = m_linearMotorDirectionLASTSET.X;
451 if (Math.Abs(m_lastLinearVelocityVector.Y) > Math.Abs(m_linearMotorDirectionLASTSET.Y))
452 m_lastLinearVelocityVector.Y = m_linearMotorDirectionLASTSET.Y;
453 if (Math.Abs(m_lastLinearVelocityVector.Z) > Math.Abs(m_linearMotorDirectionLASTSET.Z))
454 m_lastLinearVelocityVector.Z = m_linearMotorDirectionLASTSET.Z;
455
456 // decay applied velocity
457 Vector3 decayfraction = ((Vector3.One/(m_linearMotorDecayTimescale/pTimestep)));
458 //Console.WriteLine("decay: " + decayfraction);
459 m_linearMotorDirection -= m_linearMotorDirection * decayfraction;
460 //Console.WriteLine("actual: " + m_linearMotorDirection);
461 }
462 else
463 { // requested is not significant
464 // if what remains of applied is small, zero it.
465 if (m_lastLinearVelocityVector.ApproxEquals(Vector3.Zero, 0.01f))
466 m_lastLinearVelocityVector = Vector3.Zero;
467 }
468
469
470 // convert requested object velocity to world-referenced vector
471 m_dir = m_lastLinearVelocityVector;
472 d.Quaternion rot = d.BodyGetQuaternion(Body);
473 Quaternion rotq = new Quaternion(rot.X, rot.Y, rot.Z, rot.W); // rotq = rotation of object
474 m_dir *= rotq; // apply obj rotation to velocity vector
475
476 // add Gravity andBuoyancy
477 // KF: So far I have found no good method to combine a script-requested
478 // .Z velocity and gravity. Therefore only 0g will used script-requested
479 // .Z velocity. >0g (m_VehicleBuoyancy < 1) will used modified gravity only.
480 Vector3 grav = Vector3.Zero;
481 if(m_VehicleBuoyancy < 1.0f)
482 {
483 // There is some gravity, make a gravity force vector
484 // that is applied after object velocity.
485 d.Mass objMass;
486 d.BodyGetMass(Body, out objMass);
487 // m_VehicleBuoyancy: -1=2g; 0=1g; 1=0g;
488 grav.Z = _pParentScene.gravityz * objMass.mass * (1f - m_VehicleBuoyancy);
489 // Preserve the current Z velocity
490 d.Vector3 vel_now = d.BodyGetLinearVel(Body);
491 m_dir.Z = vel_now.Z; // Preserve the accumulated falling velocity
492 } // else its 1.0, no gravity.
493
494 // Check if hovering
495 if( (m_flags & (VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.HOVER_GLOBAL_HEIGHT)) != 0)
496 {
497 // We should hover, get the target height
498 d.Vector3 pos = d.BodyGetPosition(Body);
499 if((m_flags & VehicleFlag.HOVER_WATER_ONLY) == VehicleFlag.HOVER_WATER_ONLY)
500 {
501 m_VhoverTargetHeight = _pParentScene.GetWaterLevel() + m_VhoverHeight;
502 }
503 else if((m_flags & VehicleFlag.HOVER_TERRAIN_ONLY) == VehicleFlag.HOVER_TERRAIN_ONLY)
504 {
505 m_VhoverTargetHeight = _pParentScene.GetTerrainHeightAtXY(pos.X, pos.Y) + m_VhoverHeight;
506 }
507 else if((m_flags & VehicleFlag.HOVER_GLOBAL_HEIGHT) == VehicleFlag.HOVER_GLOBAL_HEIGHT)
508 {
509 m_VhoverTargetHeight = m_VhoverHeight;
510 }
511
512 if((m_flags & VehicleFlag.HOVER_UP_ONLY) == VehicleFlag.HOVER_UP_ONLY)
513 {
514 // If body is aready heigher, use its height as target height
515 if(pos.Z > m_VhoverTargetHeight) m_VhoverTargetHeight = pos.Z;
516 }
517
518// m_VhoverEfficiency = 0f; // 0=boucy, 1=Crit.damped
519// m_VhoverTimescale = 0f; // time to acheive height
520// pTimestep is time since last frame,in secs
521 float herr0 = pos.Z - m_VhoverTargetHeight;
522//if(frcount == 0) Console.WriteLine("herr0=" + herr0);
523 // Replace Vertical speed with correction figure if significant
524 if(Math.Abs(herr0) > 0.01f )
525 {
526 d.Mass objMass;
527 d.BodyGetMass(Body, out objMass);
528 m_dir.Z = - ( (herr0 * pTimestep * 50.0f) / m_VhoverTimescale);
529 // m_VhoverEfficiency is not yet implemented
530 }
531 else
532 {
533 m_dir.Z = 0f;
534 }
535 }
536
537 // Apply velocity
538 d.BodySetLinearVel(Body, m_dir.X, m_dir.Y, m_dir.Z);
539//if(frcount == 0) Console.WriteLine("Move " + Body + ":"+ m_dir.X + " " + m_dir.Y + " " + m_dir.Z);
540 // apply gravity force
541 d.BodyAddForce(Body, grav.X, grav.Y, grav.Z);
542//if(frcount == 0) Console.WriteLine("Force " + Body + ":" + grav.X + " " + grav.Y + " " + grav.Z);
543
544
545 // apply friction
546 Vector3 decayamount = Vector3.One / (m_linearFrictionTimescale / pTimestep);
547 m_lastLinearVelocityVector -= m_lastLinearVelocityVector * decayamount;
548 } // end MoveLinear()
549
550 private void MoveAngular(float pTimestep)
551 {
552
553 // m_angularMotorDirection is the latest value from the script, and is decayed here
554 // m_angularMotorDirectionLASTSET is the latest value from the script
555 // m_lastAngularVelocityVector is what is being applied to the Body, varied up and down here
556
557 if (!m_angularMotorDirection.ApproxEquals(Vector3.Zero, 0.01f))
558 {
559 if(!d.BodyIsEnabled (Body)) d.BodyEnable (Body);
560 // ramp up to new value
561 Vector3 addAmount = m_angularMotorDirection / (m_angularMotorTimescale / pTimestep);
562 m_lastAngularVelocityVector += (addAmount * 10f);
563//if(frcount == 0) Console.WriteLine("add: " + addAmount);
564
565 // limit applied value to what was set by script
566 // This will work temporarily, but we really need to compare speed on an axis
567 if (Math.Abs(m_lastAngularVelocityVector.X) > Math.Abs(m_angularMotorDirectionLASTSET.X))
568 m_lastAngularVelocityVector.X = m_angularMotorDirectionLASTSET.X;
569 if (Math.Abs(m_lastAngularVelocityVector.Y) > Math.Abs(m_angularMotorDirectionLASTSET.Y))
570 m_lastAngularVelocityVector.Y = m_angularMotorDirectionLASTSET.Y;
571 if (Math.Abs(m_lastAngularVelocityVector.Z) > Math.Abs(m_angularMotorDirectionLASTSET.Z))
572 m_lastAngularVelocityVector.Z = m_angularMotorDirectionLASTSET.Z;
573
574 // decay the requested value
575 Vector3 decayfraction = ((Vector3.One / (m_angularMotorDecayTimescale / pTimestep)));
576 //Console.WriteLine("decay: " + decayfraction);
577 m_angularMotorDirection -= m_angularMotorDirection * decayfraction;
578 //Console.WriteLine("actual: " + m_linearMotorDirection);
579 }
580 // KF: m_lastAngularVelocityVector is rotational speed in rad/sec ?
581
582 // Vertical attractor section
583
584// d.Mass objMass;
585// d.BodyGetMass(Body, out objMass);
586// float servo = 100f * objMass.mass * m_verticalAttractionEfficiency / (m_verticalAttractionTimescale * pTimestep);
587 float servo = 0.1f * m_verticalAttractionEfficiency / (m_verticalAttractionTimescale * pTimestep);
588 // get present body rotation
589 d.Quaternion rot = d.BodyGetQuaternion(Body);
590 Quaternion rotq = new Quaternion(rot.X, rot.Y, rot.Z, rot.W);
591 // make a vector pointing up
592 Vector3 verterr = Vector3.Zero;
593 verterr.Z = 1.0f;
594 // rotate it to Body Angle
595 verterr = verterr * rotq;
596 // verterr.X and .Y are the World error ammounts. They are 0 when there is no error (Vehicle Body is 'vertical'), and .Z will be 1.
597 // As the body leans to its side |.X| will increase to 1 and .Z fall to 0. As body inverts |.X| will fall and .Z will go
598 // negative. Similar for tilt and |.Y|. .X and .Y must be modulated to prevent a stable inverted body.
599 if (verterr.Z < 0.0f)
600 {
601 verterr.X = 2.0f - verterr.X;
602 verterr.Y = 2.0f - verterr.Y;
603 }
604 // Error is 0 (no error) to +/- 2 (max error)
605 // scale it by servo
606 verterr = verterr * servo;
607
608 // rotate to object frame
609 // verterr = verterr * rotq;
610
611 // As the body rotates around the X axis, then verterr.Y increases; Rotated around Y then .X increases, so
612 // Change Body angular velocity X based on Y, and Y based on X. Z is not changed.
613 m_lastAngularVelocityVector.X += verterr.Y;
614 m_lastAngularVelocityVector.Y -= verterr.X;
615/*
616if(frcount == 0)
617 {
618// Console.WriteLine("AngleMotor " + m_lastAngularVelocityVector);
619 Console.WriteLine(String.Format("VA Body:{0} servo:{1} err:<{2},{3},{4}> VAE:{5}",
620 Body, servo, verterr.X, verterr.Y, verterr.Z, m_verticalAttractionEfficiency));
621 }
622 */
623 d.BodySetAngularVel (Body, m_lastAngularVelocityVector.X, m_lastAngularVelocityVector.Y, m_lastAngularVelocityVector.Z);
624 // apply friction
625 Vector3 decayamount = Vector3.One / (m_angularFrictionTimescale / pTimestep);
626 m_lastAngularVelocityVector -= m_lastAngularVelocityVector * decayamount;
627
628 } //end MoveAngular
629 }
630}
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODEDynamics.cs b/OpenSim/Region/Physics/ChOdePlugin/ODEDynamics.cs
new file mode 100644
index 0000000..55d6945
--- /dev/null
+++ b/OpenSim/Region/Physics/ChOdePlugin/ODEDynamics.cs
@@ -0,0 +1,792 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 *
27 * Revised Aug, Sept 2009 by Kitto Flora. ODEDynamics.cs replaces
28 * ODEVehicleSettings.cs. It and ODEPrim.cs are re-organised:
29 * ODEPrim.cs contains methods dealing with Prim editing, Prim
30 * characteristics and Kinetic motion.
31 * ODEDynamics.cs contains methods dealing with Prim Physical motion
32 * (dynamics) and the associated settings. Old Linear and angular
33 * motors for dynamic motion have been replace with MoveLinear()
34 * and MoveAngular(); 'Physical' is used only to switch ODE dynamic
35 * simualtion on/off; VEHICAL_TYPE_NONE/VEHICAL_TYPE_<other> is to
36 * switch between 'VEHICLE' parameter use and general dynamics
37 * settings use.
38 *
39 */
40
41/* Revised Aug, Sept 2009 by Kitto Flora. ODEDynamics.cs replaces
42 * ODEVehicleSettings.cs. It and ODEPrim.cs are re-organised:
43 * ODEPrim.cs contains methods dealing with Prim editing, Prim
44 * characteristics and Kinetic motion.
45 * ODEDynamics.cs contains methods dealing with Prim Physical motion
46 * (dynamics) and the associated settings. Old Linear and angular
47 * motors for dynamic motion have been replace with MoveLinear()
48 * and MoveAngular(); 'Physical' is used only to switch ODE dynamic
49 * simualtion on/off; VEHICAL_TYPE_NONE/VEHICAL_TYPE_<other> is to
50 * switch between 'VEHICLE' parameter use and general dynamics
51 * settings use.
52 */
53
54using System;
55using System.Collections.Generic;
56using System.Reflection;
57using System.Runtime.InteropServices;
58using log4net;
59using OpenMetaverse;
60using Ode.NET;
61using OpenSim.Framework;
62using OpenSim.Region.Physics.Manager;
63
64namespace OpenSim.Region.Physics.OdePlugin
65{
66 public class ODEDynamics
67 {
68 public Vehicle Type
69 {
70 get { return m_type; }
71 }
72
73 public IntPtr Body
74 {
75 get { return m_body; }
76 }
77
78 private int frcount = 0; // Used to limit dynamics debug output to
79 // every 100th frame
80
81 // private OdeScene m_parentScene = null;
82 private IntPtr m_body = IntPtr.Zero;
83// private IntPtr m_jointGroup = IntPtr.Zero;
84// private IntPtr m_aMotor = IntPtr.Zero;
85
86 // Vehicle properties
87 private Vehicle m_type = Vehicle.TYPE_NONE; // If a 'VEHICLE', and what kind
88 // private Quaternion m_referenceFrame = Quaternion.Identity; // Axis modifier
89 private VehicleFlag m_flags = (VehicleFlag) 0; // Boolean settings:
90 // HOVER_TERRAIN_ONLY
91 // HOVER_GLOBAL_HEIGHT
92 // NO_DEFLECTION_UP
93 // HOVER_WATER_ONLY
94 // HOVER_UP_ONLY
95 // LIMIT_MOTOR_UP
96 // LIMIT_ROLL_ONLY
97
98 // Linear properties
99 private Vector3 m_linearMotorDirection = Vector3.Zero; // (was m_linearMotorDirectionLASTSET) the (local) Velocity
100 //requested by LSL
101 private float m_linearMotorTimescale = 0; // Motor Attack rate set by LSL
102 private float m_linearMotorDecayTimescale = 0; // Motor Decay rate set by LSL
103 private Vector3 m_linearFrictionTimescale = Vector3.Zero; // General Friction set by LSL
104
105 private Vector3 m_lLinMotorDVel = Vector3.Zero; // decayed motor
106 private Vector3 m_lLinObjectVel = Vector3.Zero; // local frame object velocity
107 private Vector3 m_wLinObjectVel = Vector3.Zero; // world frame object velocity
108
109 //Angular properties
110 private Vector3 m_angularMotorDirection = Vector3.Zero; // angular velocity requested by LSL motor
111
112 private float m_angularMotorTimescale = 0; // motor angular Attack rate set by LSL
113 private float m_angularMotorDecayTimescale = 0; // motor angular Decay rate set by LSL
114 private Vector3 m_angularFrictionTimescale = Vector3.Zero; // body angular Friction set by LSL
115
116 private Vector3 m_angularMotorDVel = Vector3.Zero; // decayed angular motor
117// private Vector3 m_angObjectVel = Vector3.Zero; // current body angular velocity
118 private Vector3 m_lastAngularVelocity = Vector3.Zero; // what was last applied to body
119
120 //Deflection properties
121 // private float m_angularDeflectionEfficiency = 0;
122 // private float m_angularDeflectionTimescale = 0;
123 // private float m_linearDeflectionEfficiency = 0;
124 // private float m_linearDeflectionTimescale = 0;
125
126 //Banking properties
127 // private float m_bankingEfficiency = 0;
128 // private float m_bankingMix = 0;
129 // private float m_bankingTimescale = 0;
130
131 //Hover and Buoyancy properties
132 private float m_VhoverHeight = 0f;
133// private float m_VhoverEfficiency = 0f;
134 private float m_VhoverTimescale = 0f;
135 private float m_VhoverTargetHeight = -1.0f; // if <0 then no hover, else its the current target height
136 private float m_VehicleBuoyancy = 0f; // Set by VEHICLE_BUOYANCY, for a vehicle.
137 // Modifies gravity. Slider between -1 (double-gravity) and 1 (full anti-gravity)
138 // KF: So far I have found no good method to combine a script-requested .Z velocity and gravity.
139 // Therefore only m_VehicleBuoyancy=1 (0g) will use the script-requested .Z velocity.
140
141 //Attractor properties
142 private float m_verticalAttractionEfficiency = 1.0f; // damped
143 private float m_verticalAttractionTimescale = 500f; // Timescale > 300 means no vert attractor.
144
145
146
147
148
149 internal void ProcessFloatVehicleParam(Vehicle pParam, float pValue)
150 {
151 switch (pParam)
152 {
153 case Vehicle.ANGULAR_DEFLECTION_EFFICIENCY:
154 if (pValue < 0.01f) pValue = 0.01f;
155 // m_angularDeflectionEfficiency = pValue;
156 break;
157 case Vehicle.ANGULAR_DEFLECTION_TIMESCALE:
158 if (pValue < 0.01f) pValue = 0.01f;
159 // m_angularDeflectionTimescale = pValue;
160 break;
161 case Vehicle.ANGULAR_MOTOR_DECAY_TIMESCALE:
162 if (pValue < 0.01f) pValue = 0.01f;
163 m_angularMotorDecayTimescale = pValue;
164 break;
165 case Vehicle.ANGULAR_MOTOR_TIMESCALE:
166 if (pValue < 0.01f) pValue = 0.01f;
167 m_angularMotorTimescale = pValue;
168 break;
169 case Vehicle.BANKING_EFFICIENCY:
170 if (pValue < 0.01f) pValue = 0.01f;
171 // m_bankingEfficiency = pValue;
172 break;
173 case Vehicle.BANKING_MIX:
174 if (pValue < 0.01f) pValue = 0.01f;
175 // m_bankingMix = pValue;
176 break;
177 case Vehicle.BANKING_TIMESCALE:
178 if (pValue < 0.01f) pValue = 0.01f;
179 // m_bankingTimescale = pValue;
180 break;
181 case Vehicle.BUOYANCY:
182 if (pValue < -1f) pValue = -1f;
183 if (pValue > 1f) pValue = 1f;
184 m_VehicleBuoyancy = pValue;
185 break;
186// case Vehicle.HOVER_EFFICIENCY:
187// if (pValue < 0f) pValue = 0f;
188// if (pValue > 1f) pValue = 1f;
189// m_VhoverEfficiency = pValue;
190// break;
191 case Vehicle.HOVER_HEIGHT:
192 m_VhoverHeight = pValue;
193 break;
194 case Vehicle.HOVER_TIMESCALE:
195 if (pValue < 0.01f) pValue = 0.01f;
196 m_VhoverTimescale = pValue;
197 break;
198 case Vehicle.LINEAR_DEFLECTION_EFFICIENCY:
199 if (pValue < 0.01f) pValue = 0.01f;
200 // m_linearDeflectionEfficiency = pValue;
201 break;
202 case Vehicle.LINEAR_DEFLECTION_TIMESCALE:
203 if (pValue < 0.01f) pValue = 0.01f;
204 // m_linearDeflectionTimescale = pValue;
205 break;
206 case Vehicle.LINEAR_MOTOR_DECAY_TIMESCALE:
207 if (pValue < 0.01f) pValue = 0.01f;
208 m_linearMotorDecayTimescale = pValue;
209 break;
210 case Vehicle.LINEAR_MOTOR_TIMESCALE:
211 if (pValue < 0.01f) pValue = 0.01f;
212 m_linearMotorTimescale = pValue;
213 break;
214 case Vehicle.VERTICAL_ATTRACTION_EFFICIENCY:
215 if (pValue < 0.1f) pValue = 0.1f; // Less goes unstable
216 if (pValue > 1.0f) pValue = 1.0f;
217 m_verticalAttractionEfficiency = pValue;
218 break;
219 case Vehicle.VERTICAL_ATTRACTION_TIMESCALE:
220 if (pValue < 0.01f) pValue = 0.01f;
221 m_verticalAttractionTimescale = pValue;
222 break;
223
224 // These are vector properties but the engine lets you use a single float value to
225 // set all of the components to the same value
226 case Vehicle.ANGULAR_FRICTION_TIMESCALE:
227 if (pValue > 30f) pValue = 30f;
228 if (pValue < 0.1f) pValue = 0.1f;
229 m_angularFrictionTimescale = new Vector3(pValue, pValue, pValue);
230 break;
231 case Vehicle.ANGULAR_MOTOR_DIRECTION:
232 m_angularMotorDirection = new Vector3(pValue, pValue, pValue);
233 UpdateAngDecay();
234 break;
235 case Vehicle.LINEAR_FRICTION_TIMESCALE:
236 m_linearFrictionTimescale = new Vector3(pValue, pValue, pValue);
237 break;
238 case Vehicle.LINEAR_MOTOR_DIRECTION:
239 m_linearMotorDirection = new Vector3(pValue, pValue, pValue);
240 UpdateLinDecay();
241 break;
242 case Vehicle.LINEAR_MOTOR_OFFSET:
243 // m_linearMotorOffset = new Vector3(pValue, pValue, pValue);
244 break;
245
246 }
247
248 }//end ProcessFloatVehicleParam
249
250 internal void ProcessVectorVehicleParam(Vehicle pParam, Vector3 pValue)
251 {
252 switch (pParam)
253 {
254 case Vehicle.ANGULAR_FRICTION_TIMESCALE:
255 if (pValue.X > 30f) pValue.X = 30f;
256 if (pValue.X < 0.1f) pValue.X = 0.1f;
257 if (pValue.Y > 30f) pValue.Y = 30f;
258 if (pValue.Y < 0.1f) pValue.Y = 0.1f;
259 if (pValue.Z > 30f) pValue.Z = 30f;
260 if (pValue.Z < 0.1f) pValue.Z = 0.1f;
261 m_angularFrictionTimescale = new Vector3(pValue.X, pValue.Y, pValue.Z);
262 break;
263 case Vehicle.ANGULAR_MOTOR_DIRECTION:
264 m_angularMotorDirection = new Vector3(pValue.X, pValue.Y, pValue.Z);
265 // Limit requested angular speed to 2 rps= 4 pi rads/sec
266 if(m_angularMotorDirection.X > 12.56f) m_angularMotorDirection.X = 12.56f;
267 if(m_angularMotorDirection.X < - 12.56f) m_angularMotorDirection.X = - 12.56f;
268 if(m_angularMotorDirection.Y > 12.56f) m_angularMotorDirection.Y = 12.56f;
269 if(m_angularMotorDirection.Y < - 12.56f) m_angularMotorDirection.Y = - 12.56f;
270 if(m_angularMotorDirection.Z > 12.56f) m_angularMotorDirection.Z = 12.56f;
271 if(m_angularMotorDirection.Z < - 12.56f) m_angularMotorDirection.Z = - 12.56f;
272 UpdateAngDecay();
273 break;
274 case Vehicle.LINEAR_FRICTION_TIMESCALE:
275 m_linearFrictionTimescale = new Vector3(pValue.X, pValue.Y, pValue.Z);
276 break;
277 case Vehicle.LINEAR_MOTOR_DIRECTION:
278 m_linearMotorDirection = new Vector3(pValue.X, pValue.Y, pValue.Z); // velocity requested by LSL, for max limiting
279 UpdateLinDecay();
280 break;
281 case Vehicle.LINEAR_MOTOR_OFFSET:
282 // m_linearMotorOffset = new Vector3(pValue.X, pValue.Y, pValue.Z);
283 break;
284 }
285
286 }//end ProcessVectorVehicleParam
287
288 internal void ProcessRotationVehicleParam(Vehicle pParam, Quaternion pValue)
289 {
290 switch (pParam)
291 {
292 case Vehicle.REFERENCE_FRAME:
293 // m_referenceFrame = pValue;
294 break;
295 }
296
297 }//end ProcessRotationVehicleParam
298
299 internal void ProcessFlagsVehicleSet(int flags)
300 {
301 m_flags |= (VehicleFlag)flags;
302 }
303
304 internal void ProcessFlagsVehicleRemove(int flags)
305 {
306 m_flags &= ~((VehicleFlag)flags);
307 }
308
309 internal void ProcessTypeChange(Vehicle pType)
310 {
311 // Set Defaults For Type
312 m_type = pType;
313 switch (pType)
314 {
315 case Vehicle.TYPE_SLED:
316 m_linearFrictionTimescale = new Vector3(30, 1, 1000);
317 m_angularFrictionTimescale = new Vector3(30, 30, 30);
318// m_lLinMotorVel = Vector3.Zero;
319 m_linearMotorTimescale = 1000;
320 m_linearMotorDecayTimescale = 120;
321 m_angularMotorDirection = Vector3.Zero;
322 m_angularMotorDVel = Vector3.Zero;
323 m_angularMotorTimescale = 1000;
324 m_angularMotorDecayTimescale = 120;
325 m_VhoverHeight = 0;
326// m_VhoverEfficiency = 1;
327 m_VhoverTimescale = 10;
328 m_VehicleBuoyancy = 0;
329 // m_linearDeflectionEfficiency = 1;
330 // m_linearDeflectionTimescale = 1;
331 // m_angularDeflectionEfficiency = 1;
332 // m_angularDeflectionTimescale = 1000;
333 // m_bankingEfficiency = 0;
334 // m_bankingMix = 1;
335 // m_bankingTimescale = 10;
336 // m_referenceFrame = Quaternion.Identity;
337 m_flags &=
338 ~(VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY |
339 VehicleFlag.HOVER_GLOBAL_HEIGHT | VehicleFlag.HOVER_UP_ONLY);
340 m_flags |= (VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.LIMIT_ROLL_ONLY | VehicleFlag.LIMIT_MOTOR_UP);
341 break;
342 case Vehicle.TYPE_CAR:
343 m_linearFrictionTimescale = new Vector3(100, 2, 1000);
344 m_angularFrictionTimescale = new Vector3(30, 30, 30); // was 1000, but sl max frict time is 30.
345// m_lLinMotorVel = Vector3.Zero;
346 m_linearMotorTimescale = 1;
347 m_linearMotorDecayTimescale = 60;
348 m_angularMotorDirection = Vector3.Zero;
349 m_angularMotorDVel = Vector3.Zero;
350 m_angularMotorTimescale = 1;
351 m_angularMotorDecayTimescale = 0.8f;
352 m_VhoverHeight = 0;
353// m_VhoverEfficiency = 0;
354 m_VhoverTimescale = 1000;
355 m_VehicleBuoyancy = 0;
356 // // m_linearDeflectionEfficiency = 1;
357 // // m_linearDeflectionTimescale = 2;
358 // // m_angularDeflectionEfficiency = 0;
359 // m_angularDeflectionTimescale = 10;
360 m_verticalAttractionEfficiency = 1f;
361 m_verticalAttractionTimescale = 10f;
362 // m_bankingEfficiency = -0.2f;
363 // m_bankingMix = 1;
364 // m_bankingTimescale = 1;
365 // m_referenceFrame = Quaternion.Identity;
366 m_flags &= ~(VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.HOVER_GLOBAL_HEIGHT);
367 m_flags |= (VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.LIMIT_ROLL_ONLY | VehicleFlag.HOVER_UP_ONLY |
368 VehicleFlag.LIMIT_MOTOR_UP);
369 break;
370 case Vehicle.TYPE_BOAT:
371 m_linearFrictionTimescale = new Vector3(10, 3, 2);
372 m_angularFrictionTimescale = new Vector3(10,10,10);
373// m_lLinMotorVel = Vector3.Zero;
374 m_linearMotorTimescale = 5;
375 m_linearMotorDecayTimescale = 60;
376 m_angularMotorDirection = Vector3.Zero;
377 m_angularMotorDVel = Vector3.Zero;
378 m_angularMotorTimescale = 4;
379 m_angularMotorDecayTimescale = 4;
380 m_VhoverHeight = 0;
381// m_VhoverEfficiency = 0.5f;
382 m_VhoverTimescale = 2;
383 m_VehicleBuoyancy = 1;
384 // m_linearDeflectionEfficiency = 0.5f;
385 // m_linearDeflectionTimescale = 3;
386 // m_angularDeflectionEfficiency = 0.5f;
387 // m_angularDeflectionTimescale = 5;
388 m_verticalAttractionEfficiency = 0.5f;
389 m_verticalAttractionTimescale = 5f;
390 // m_bankingEfficiency = -0.3f;
391 // m_bankingMix = 0.8f;
392 // m_bankingTimescale = 1;
393 // m_referenceFrame = Quaternion.Identity;
394 m_flags &= ~(VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.LIMIT_ROLL_ONLY |
395 VehicleFlag.HOVER_GLOBAL_HEIGHT | VehicleFlag.HOVER_UP_ONLY);
396 m_flags |= (VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.HOVER_WATER_ONLY |
397 VehicleFlag.LIMIT_MOTOR_UP);
398 break;
399 case Vehicle.TYPE_AIRPLANE:
400 m_linearFrictionTimescale = new Vector3(200, 10, 5);
401 m_angularFrictionTimescale = new Vector3(20, 20, 20);
402// m_lLinMotorVel = Vector3.Zero;
403 m_linearMotorTimescale = 2;
404 m_linearMotorDecayTimescale = 60;
405 m_angularMotorDirection = Vector3.Zero;
406 m_angularMotorDVel = Vector3.Zero;
407 m_angularMotorTimescale = 4;
408 m_angularMotorDecayTimescale = 4;
409 m_VhoverHeight = 0;
410// m_VhoverEfficiency = 0.5f;
411 m_VhoverTimescale = 1000;
412 m_VehicleBuoyancy = 0;
413 // m_linearDeflectionEfficiency = 0.5f;
414 // m_linearDeflectionTimescale = 3;
415 // m_angularDeflectionEfficiency = 1;
416 // m_angularDeflectionTimescale = 2;
417 m_verticalAttractionEfficiency = 0.9f;
418 m_verticalAttractionTimescale = 2f;
419 // m_bankingEfficiency = 1;
420 // m_bankingMix = 0.7f;
421 // m_bankingTimescale = 2;
422 // m_referenceFrame = Quaternion.Identity;
423 m_flags &= ~(VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY |
424 VehicleFlag.HOVER_GLOBAL_HEIGHT | VehicleFlag.HOVER_UP_ONLY | VehicleFlag.LIMIT_MOTOR_UP);
425 m_flags |= (VehicleFlag.LIMIT_ROLL_ONLY);
426 break;
427 case Vehicle.TYPE_BALLOON:
428 m_linearFrictionTimescale = new Vector3(5, 5, 5);
429 m_angularFrictionTimescale = new Vector3(10, 10, 10);
430 m_linearMotorTimescale = 5;
431 m_linearMotorDecayTimescale = 60;
432 m_angularMotorDirection = Vector3.Zero;
433 m_angularMotorDVel = Vector3.Zero;
434 m_angularMotorTimescale = 6;
435 m_angularMotorDecayTimescale = 10;
436 m_VhoverHeight = 5;
437// m_VhoverEfficiency = 0.8f;
438 m_VhoverTimescale = 10;
439 m_VehicleBuoyancy = 1;
440 // m_linearDeflectionEfficiency = 0;
441 // m_linearDeflectionTimescale = 5;
442 // m_angularDeflectionEfficiency = 0;
443 // m_angularDeflectionTimescale = 5;
444 m_verticalAttractionEfficiency = 1f;
445 m_verticalAttractionTimescale = 100f;
446 // m_bankingEfficiency = 0;
447 // m_bankingMix = 0.7f;
448 // m_bankingTimescale = 5;
449 // m_referenceFrame = Quaternion.Identity;
450 m_flags &= ~(VehicleFlag.NO_DEFLECTION_UP | VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY |
451 VehicleFlag.HOVER_UP_ONLY | VehicleFlag.LIMIT_MOTOR_UP);
452 m_flags |= (VehicleFlag.LIMIT_ROLL_ONLY | VehicleFlag.HOVER_GLOBAL_HEIGHT);
453 break;
454
455 }
456 }//end SetDefaultsForType
457
458 internal void Enable(IntPtr pBody, OdeScene pParentScene)
459 {
460 if (m_type == Vehicle.TYPE_NONE)
461 return;
462
463 m_body = pBody;
464 }
465
466 internal void Step(float pTimestep, OdeScene pParentScene)
467 {
468 if (m_body == IntPtr.Zero || m_type == Vehicle.TYPE_NONE)
469 return;
470 frcount++; // used to limit debug comment output
471 if (frcount > 24)
472 frcount = 0;
473
474 MoveLinear(pTimestep, pParentScene);
475 MoveAngular(pTimestep);
476 }// end Step
477
478 internal void Halt()
479 { // Kill all motions, when non-physical
480 m_linearMotorDirection = Vector3.Zero;
481 m_lLinMotorDVel = Vector3.Zero;
482 m_lLinObjectVel = Vector3.Zero;
483 m_wLinObjectVel = Vector3.Zero;
484 m_angularMotorDirection = Vector3.Zero;
485 m_lastAngularVelocity = Vector3.Zero;
486 m_angularMotorDVel = Vector3.Zero;
487 }
488
489 private void UpdateLinDecay()
490 {
491 if (Math.Abs(m_linearMotorDirection.X) > Math.Abs(m_lLinMotorDVel.X)) m_lLinMotorDVel.X = m_linearMotorDirection.X;
492 if (Math.Abs(m_linearMotorDirection.Y) > Math.Abs(m_lLinMotorDVel.Y)) m_lLinMotorDVel.Y = m_linearMotorDirection.Y;
493 if (Math.Abs(m_linearMotorDirection.Z) > Math.Abs(m_lLinMotorDVel.Z)) m_lLinMotorDVel.Z = m_linearMotorDirection.Z;
494 } // else let the motor decay on its own
495
496 private void MoveLinear(float pTimestep, OdeScene _pParentScene)
497 {
498 Vector3 acceleration = new Vector3(0f, 0f, 0f);
499
500 d.Quaternion rot = d.BodyGetQuaternion(Body);
501 Quaternion rotq = new Quaternion(rot.X, rot.Y, rot.Z, rot.W); // rotq = rotation of object
502 Quaternion irotq = Quaternion.Inverse(rotq);
503 d.Vector3 velnow = d.BodyGetLinearVel(Body); // this is in world frame
504 Vector3 vel_now = new Vector3(velnow.X, velnow.Y, velnow.Z);
505 acceleration = vel_now - m_wLinObjectVel;
506 m_lLinObjectVel = vel_now * irotq;
507
508 if (m_linearMotorDecayTimescale < 300.0f) //setting of 300 or more disables decay rate
509 {
510 if ( Vector3.Mag(m_lLinMotorDVel) < 1.0f)
511 {
512 float decayfactor = m_linearMotorDecayTimescale/pTimestep;
513 Vector3 decayAmount = (m_lLinMotorDVel/decayfactor);
514 m_lLinMotorDVel -= decayAmount;
515 }
516 else
517 {
518 float decayfactor = 3.0f - (0.57f * (float)Math.Log((double)(m_linearMotorDecayTimescale)));
519 Vector3 decel = Vector3.Normalize(m_lLinMotorDVel) * decayfactor * pTimestep;
520 m_lLinMotorDVel -= decel;
521 }
522 if (m_lLinMotorDVel.ApproxEquals(Vector3.Zero, 0.01f))
523 {
524 m_lLinMotorDVel = Vector3.Zero;
525 }
526 else
527 {
528 if (Math.Abs(m_lLinMotorDVel.X) < Math.Abs(m_lLinObjectVel.X)) m_lLinObjectVel.X = m_lLinMotorDVel.X;
529 if (Math.Abs(m_lLinMotorDVel.Y) < Math.Abs(m_lLinObjectVel.Y)) m_lLinObjectVel.Y = m_lLinMotorDVel.Y;
530 if (Math.Abs(m_lLinMotorDVel.Z) < Math.Abs(m_lLinObjectVel.Z)) m_lLinObjectVel.Z = m_lLinMotorDVel.Z;
531 }
532 }
533
534 if ( (! m_lLinMotorDVel.ApproxEquals(Vector3.Zero, 0.01f)) || (! m_lLinObjectVel.ApproxEquals(Vector3.Zero, 0.01f)) )
535 {
536 if(!d.BodyIsEnabled (Body)) d.BodyEnable (Body);
537 if (m_linearMotorTimescale < 300.0f)
538 {
539 Vector3 attack_error = m_lLinMotorDVel - m_lLinObjectVel;
540 float linfactor = m_linearMotorTimescale/pTimestep;
541 Vector3 attackAmount = (attack_error/linfactor) * 1.3f;
542 m_lLinObjectVel += attackAmount;
543 }
544 if (m_linearFrictionTimescale.X < 300.0f)
545 {
546 float fricfactor = m_linearFrictionTimescale.X / pTimestep;
547 float fricX = m_lLinObjectVel.X / fricfactor;
548 m_lLinObjectVel.X -= fricX;
549 }
550 if (m_linearFrictionTimescale.Y < 300.0f)
551 {
552 float fricfactor = m_linearFrictionTimescale.Y / pTimestep;
553 float fricY = m_lLinObjectVel.Y / fricfactor;
554 m_lLinObjectVel.Y -= fricY;
555 }
556 if (m_linearFrictionTimescale.Z < 300.0f)
557 {
558 float fricfactor = m_linearFrictionTimescale.Z / pTimestep;
559//if(frcount == 0) Console.WriteLine("Zfric={0}", fricfactor);
560 float fricZ = m_lLinObjectVel.Z / fricfactor;
561 m_lLinObjectVel.Z -= fricZ;
562 }
563 }
564 m_wLinObjectVel = m_lLinObjectVel * rotq;
565 // Add Gravity and Buoyancy
566 Vector3 grav = Vector3.Zero;
567 if(m_VehicleBuoyancy < 1.0f)
568 {
569 // There is some gravity, make a gravity force vector
570 // that is applied after object velocity.
571 d.Mass objMass;
572 d.BodyGetMass(Body, out objMass);
573 // m_VehicleBuoyancy: -1=2g; 0=1g; 1=0g;
574 grav.Z = _pParentScene.gravityz * objMass.mass * (1f - m_VehicleBuoyancy); // Applied later as a force
575 } // else its 1.0, no gravity.
576
577 // Check if hovering
578 if( (m_flags & (VehicleFlag.HOVER_WATER_ONLY | VehicleFlag.HOVER_TERRAIN_ONLY | VehicleFlag.HOVER_GLOBAL_HEIGHT)) != 0)
579 {
580 // We should hover, get the target height
581 d.Vector3 pos = d.BodyGetPosition(Body);
582 if((m_flags & VehicleFlag.HOVER_WATER_ONLY) == VehicleFlag.HOVER_WATER_ONLY)
583 {
584 m_VhoverTargetHeight = _pParentScene.GetWaterLevel() + m_VhoverHeight;
585 }
586 else if((m_flags & VehicleFlag.HOVER_TERRAIN_ONLY) == VehicleFlag.HOVER_TERRAIN_ONLY)
587 {
588 m_VhoverTargetHeight = _pParentScene.GetTerrainHeightAtXY(pos.X, pos.Y) + m_VhoverHeight;
589 }
590 else if((m_flags & VehicleFlag.HOVER_GLOBAL_HEIGHT) == VehicleFlag.HOVER_GLOBAL_HEIGHT)
591 {
592 m_VhoverTargetHeight = m_VhoverHeight;
593 }
594
595 if((m_flags & VehicleFlag.HOVER_UP_ONLY) == VehicleFlag.HOVER_UP_ONLY)
596 {
597 // If body is aready heigher, use its height as target height
598 if(pos.Z > m_VhoverTargetHeight) m_VhoverTargetHeight = pos.Z;
599 }
600
601// m_VhoverEfficiency = 0f; // 0=boucy, 1=Crit.damped
602// m_VhoverTimescale = 0f; // time to acheive height
603// pTimestep is time since last frame,in secs
604 float herr0 = pos.Z - m_VhoverTargetHeight;
605 // Replace Vertical speed with correction figure if significant
606 if(Math.Abs(herr0) > 0.01f )
607 {
608 d.Mass objMass;
609 d.BodyGetMass(Body, out objMass);
610 m_wLinObjectVel.Z = - ( (herr0 * pTimestep * 50.0f) / m_VhoverTimescale);
611 //KF: m_VhoverEfficiency is not yet implemented
612 }
613 else
614 {
615 m_wLinObjectVel.Z = 0f;
616 }
617 }
618 else
619 { // not hovering, Gravity rules
620 m_wLinObjectVel.Z = vel_now.Z;
621//if(frcount == 0) Console.WriteLine(" Z {0} a.Z {1}", m_wLinObjectVel.Z, acceleration.Z);
622 }
623 // Apply velocity
624 d.BodySetLinearVel(Body, m_wLinObjectVel.X, m_wLinObjectVel.Y, m_wLinObjectVel.Z);
625 // apply gravity force
626 d.BodyAddForce(Body, grav.X, grav.Y, grav.Z);
627//if(frcount == 0) Console.WriteLine("Grav {0}", grav);
628 } // end MoveLinear()
629
630 private void UpdateAngDecay()
631 {
632 if (Math.Abs(m_angularMotorDirection.X) > Math.Abs(m_angularMotorDVel.X)) m_angularMotorDVel.X = m_angularMotorDirection.X;
633 if (Math.Abs(m_angularMotorDirection.Y) > Math.Abs(m_angularMotorDVel.Y)) m_angularMotorDVel.Y = m_angularMotorDirection.Y;
634 if (Math.Abs(m_angularMotorDirection.Z) > Math.Abs(m_angularMotorDVel.Z)) m_angularMotorDVel.Z = m_angularMotorDirection.Z;
635 } // else let the motor decay on its own
636
637 private void MoveAngular(float pTimestep)
638 {
639 /*
640 private Vector3 m_angularMotorDirection = Vector3.Zero; // angular velocity requested by LSL motor
641
642 private float m_angularMotorTimescale = 0; // motor angular Attack rate set by LSL
643 private float m_angularMotorDecayTimescale = 0; // motor angular Decay rate set by LSL
644 private Vector3 m_angularFrictionTimescale = Vector3.Zero; // body angular Friction set by LSL
645
646 private Vector3 m_angularMotorDVel = Vector3.Zero; // decayed angular motor
647 private Vector3 m_angObjectVel = Vector3.Zero; // what was last applied to body
648 */
649//if(frcount == 0) Console.WriteLine("MoveAngular ");
650
651 // Get what the body is doing, this includes 'external' influences
652 d.Vector3 angularObjectVel = d.BodyGetAngularVel(Body);
653 Vector3 angObjectVel = new Vector3(angularObjectVel.X, angularObjectVel.Y, angularObjectVel.Z);
654//if(frcount == 0) Console.WriteLine("V0 = {0}", angObjectVel);
655// Vector3 FrAaccel = m_lastAngularVelocity - angObjectVel;
656// Vector3 initavel = angObjectVel;
657 // Decay Angular Motor 1. In SL this also depends on attack rate! decay ~= 23/Attack.
658 float atk_decayfactor = 23.0f / (m_angularMotorTimescale * pTimestep);
659 m_angularMotorDVel -= m_angularMotorDVel / atk_decayfactor;
660 // Decay Angular Motor 2.
661 if (m_angularMotorDecayTimescale < 300.0f)
662 {
663//####
664 if ( Vector3.Mag(m_angularMotorDVel) < 1.0f)
665 {
666 float decayfactor = (m_angularMotorDecayTimescale)/pTimestep;
667 Vector3 decayAmount = (m_angularMotorDVel/decayfactor);
668 m_angularMotorDVel -= decayAmount;
669 }
670 else
671 {
672 Vector3 decel = Vector3.Normalize(m_angularMotorDVel) * pTimestep / m_angularMotorDecayTimescale;
673 m_angularMotorDVel -= decel;
674 }
675
676 if (m_angularMotorDVel.ApproxEquals(Vector3.Zero, 0.01f))
677 {
678 m_angularMotorDVel = Vector3.Zero;
679 }
680 else
681 {
682 if (Math.Abs(m_angularMotorDVel.X) < Math.Abs(angObjectVel.X)) angObjectVel.X = m_angularMotorDVel.X;
683 if (Math.Abs(m_angularMotorDVel.Y) < Math.Abs(angObjectVel.Y)) angObjectVel.Y = m_angularMotorDVel.Y;
684 if (Math.Abs(m_angularMotorDVel.Z) < Math.Abs(angObjectVel.Z)) angObjectVel.Z = m_angularMotorDVel.Z;
685 }
686 } // end decay angular motor
687//if(frcount == 0) Console.WriteLine("MotorDvel {0} Obj {1}", m_angularMotorDVel, angObjectVel);
688
689//if(frcount == 0) Console.WriteLine("VA = {0}", angObjectVel);
690 // Vertical attractor section
691 Vector3 vertattr = Vector3.Zero;
692
693 if(m_verticalAttractionTimescale < 300)
694 {
695 float VAservo = 1.0f / (m_verticalAttractionTimescale * pTimestep);
696 // get present body rotation
697 d.Quaternion rot = d.BodyGetQuaternion(Body);
698 Quaternion rotq = new Quaternion(rot.X, rot.Y, rot.Z, rot.W);
699 // make a vector pointing up
700 Vector3 verterr = Vector3.Zero;
701 verterr.Z = 1.0f;
702 // rotate it to Body Angle
703 verterr = verterr * rotq;
704 // verterr.X and .Y are the World error ammounts. They are 0 when there is no error (Vehicle Body is 'vertical'), and .Z will be 1.
705 // As the body leans to its side |.X| will increase to 1 and .Z fall to 0. As body inverts |.X| will fall and .Z will go
706 // negative. Similar for tilt and |.Y|. .X and .Y must be modulated to prevent a stable inverted body.
707
708 if (verterr.Z < 0.0f)
709 { // Defelction from vertical exceeds 90-degrees. This method will ensure stable return to
710 // vertical, BUT for some reason a z-rotation is imparted to the object. TBI.
711//Console.WriteLine("InvertFlip");
712 verterr.X = 2.0f - verterr.X;
713 verterr.Y = 2.0f - verterr.Y;
714 }
715 verterr *= 0.5f;
716 // verterror is 0 (no error) to +/- 1 (max error at 180-deg tilt)
717
718 if ((!angObjectVel.ApproxEquals(Vector3.Zero, 0.001f)) || (verterr.Z < 0.49f))
719 {
720//if(frcount == 0)
721 // As the body rotates around the X axis, then verterr.Y increases; Rotated around Y then .X increases, so
722 // Change Body angular velocity X based on Y, and Y based on X. Z is not changed.
723 vertattr.X = verterr.Y;
724 vertattr.Y = - verterr.X;
725 vertattr.Z = 0f;
726//if(frcount == 0) Console.WriteLine("VAerr=" + verterr);
727
728 // scaling appears better usingsquare-law
729 float damped = m_verticalAttractionEfficiency * m_verticalAttractionEfficiency;
730 float bounce = 1.0f - damped;
731 // 0 = crit damp, 1 = bouncy
732 float oavz = angObjectVel.Z; // retain z velocity
733 angObjectVel = (angObjectVel + (vertattr * VAservo * 0.0333f)) * bounce; // The time-scaled correction, which sums, therefore is bouncy
734 angObjectVel = angObjectVel + (vertattr * VAservo * 0.0667f * damped); // damped, good @ < 90.
735 angObjectVel.Z = oavz;
736//if(frcount == 0) Console.WriteLine("VA+");
737//Console.WriteLine("VAttr {0} OAvel {1}", vertattr, angObjectVel);
738 }
739 else
740 {
741 // else error is very small
742 angObjectVel.X = 0f;
743 angObjectVel.Y = 0f;
744//if(frcount == 0) Console.WriteLine("VA0");
745 }
746 } // else vertical attractor is off
747//if(frcount == 0) Console.WriteLine("V1 = {0}", angObjectVel);
748
749 if ( (! m_angularMotorDVel.ApproxEquals(Vector3.Zero, 0.01f)) || (! angObjectVel.ApproxEquals(Vector3.Zero, 0.01f)) )
750 { // if motor or object have motion
751 if(!d.BodyIsEnabled (Body)) d.BodyEnable (Body);
752
753 if (m_angularMotorTimescale < 300.0f)
754 {
755 Vector3 attack_error = m_angularMotorDVel - angObjectVel;
756 float angfactor = m_angularMotorTimescale/pTimestep;
757 Vector3 attackAmount = (attack_error/angfactor);
758 angObjectVel += attackAmount;
759//if(frcount == 0) Console.WriteLine("Accel {0} Attk {1}",FrAaccel, attackAmount);
760//if(frcount == 0) Console.WriteLine("V2+= {0}", angObjectVel);
761 }
762
763 angObjectVel.X -= angObjectVel.X / (m_angularFrictionTimescale.X * 0.7f / pTimestep);
764 angObjectVel.Y -= angObjectVel.Y / (m_angularFrictionTimescale.Y * 0.7f / pTimestep);
765 angObjectVel.Z -= angObjectVel.Z / (m_angularFrictionTimescale.Z * 0.7f / pTimestep);
766 } // else no signif. motion
767
768//if(frcount == 0) Console.WriteLine("Dmotor {0} Obj {1}", m_angularMotorDVel, angObjectVel);
769 // Bank section tba
770 // Deflection section tba
771//if(frcount == 0) Console.WriteLine("V3 = {0}", angObjectVel);
772
773 m_lastAngularVelocity = angObjectVel;
774/*
775 if (!m_lastAngularVelocity.ApproxEquals(Vector3.Zero, 0.0001f))
776 {
777 if(!d.BodyIsEnabled (Body)) d.BodyEnable (Body);
778 }
779 else
780 {
781 m_lastAngularVelocity = Vector3.Zero; // Reduce small value to zero.
782 }
783 */
784 // Apply to the body
785// Vector3 aInc = m_lastAngularVelocity - initavel;
786//if(frcount == 0) Console.WriteLine("Inc {0}", aInc);
787 d.BodySetAngularVel (Body, m_lastAngularVelocity.X, m_lastAngularVelocity.Y, m_lastAngularVelocity.Z);
788//if(frcount == 0) Console.WriteLine("V4 = {0}", m_lastAngularVelocity);
789
790 } //end MoveAngular
791 }
792}
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
new file mode 100644
index 0000000..0eb9bb5
--- /dev/null
+++ b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
@@ -0,0 +1,3296 @@
1/* Copyright (c) Contributors, http://opensimulator.org/
2 * See CONTRIBUTORS.TXT for a full list of copyright holders.
3 * Redistribution and use in source and binary forms, with or without
4 * modification, are permitted provided that the following conditions are met:
5 * * Redistributions of source code must retain the above copyright
6 * notice, this list of conditions and the following disclaimer.
7 * * Redistributions in binary form must reproduce the above copyright
8 * notice, this list of conditions and the following disclaimer in the
9 * documentation and/or other materials provided with the distribution.
10 * * Neither the name of the OpenSimulator Project nor the
11 * names of its contributors may be used to endorse or promote products
12 * derived from this software without specific prior written permission.
13 *
14 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
16 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
17 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
18 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
19 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
20 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
21 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
23 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 *
25 * Revised August 26 2009 by Kitto Flora. ODEDynamics.cs replaces
26 * ODEVehicleSettings.cs. It and ODEPrim.cs are re-organised:
27 * ODEPrim.cs contains methods dealing with Prim editing, Prim
28 * characteristics and Kinetic motion.
29 * ODEDynamics.cs contains methods dealing with Prim Physical motion
30 * (dynamics) and the associated settings. Old Linear and angular
31 * motors for dynamic motion have been replace with MoveLinear()
32 * and MoveAngular(); 'Physical' is used only to switch ODE dynamic
33 * simualtion on/off; VEHICAL_TYPE_NONE/VEHICAL_TYPE_<other> is to
34 * switch between 'VEHICLE' parameter use and general dynamics
35 * settings use.
36 */
37
38/*
39 * Revised August 26 2009 by Kitto Flora. ODEDynamics.cs replaces
40 * ODEVehicleSettings.cs. It and ODEPrim.cs are re-organised:
41 * ODEPrim.cs contains methods dealing with Prim editing, Prim
42 * characteristics and Kinetic motion.
43 * ODEDynamics.cs contains methods dealing with Prim Physical motion
44 * (dynamics) and the associated settings. Old Linear and angular
45 * motors for dynamic motion have been replace with MoveLinear()
46 * and MoveAngular(); 'Physical' is used only to switch ODE dynamic
47 * simualtion on/off; VEHICAL_TYPE_NONE/VEHICAL_TYPE_<other> is to
48 * switch between 'VEHICLE' parameter use and general dynamics
49 * settings use.
50 */
51using System;
52using System.Collections.Generic;
53using System.Reflection;
54using System.Runtime.InteropServices;
55using System.Threading;
56using log4net;
57using OpenMetaverse;
58using Ode.NET;
59using OpenSim.Framework;
60using OpenSim.Region.Physics.Manager;
61
62namespace OpenSim.Region.Physics.OdePlugin
63{
64 /// <summary>
65 /// Various properties that ODE uses for AMotors but isn't exposed in ODE.NET so we must define them ourselves.
66 /// </summary>
67
68 public class OdePrim : PhysicsActor
69 {
70 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
71
72 private Vector3 _position;
73 private Vector3 _velocity;
74 private Vector3 _torque;
75 private Vector3 m_lastVelocity;
76 private Vector3 m_lastposition;
77 private Quaternion m_lastorientation = new Quaternion();
78 private Vector3 m_rotationalVelocity;
79 private Vector3 _size;
80 private Vector3 _acceleration;
81 // private d.Vector3 _zeroPosition = new d.Vector3(0.0f, 0.0f, 0.0f);
82 private Quaternion _orientation;
83 private Vector3 m_taintposition;
84 private Vector3 m_taintsize;
85 private Vector3 m_taintVelocity;
86 private Vector3 m_taintTorque;
87 private Quaternion m_taintrot;
88 private Vector3 m_angularlock = Vector3.One;
89 private Vector3 m_taintAngularLock = Vector3.One;
90 private IntPtr Amotor = IntPtr.Zero;
91
92 private Vector3 m_PIDTarget;
93 private float m_PIDTau;
94 private float PID_D = 35f;
95 private float PID_G = 25f;
96 private bool m_usePID = false;
97
98 private Quaternion m_APIDTarget = new Quaternion();
99 private float m_APIDStrength = 0.5f;
100 private float m_APIDDamping = 0.5f;
101 private bool m_useAPID = false;
102
103 // KF: These next 7 params apply to llSetHoverHeight(float height, integer water, float tau),
104 // and are for non-VEHICLES only.
105
106 private float m_PIDHoverHeight;
107 private float m_PIDHoverTau;
108 private bool m_useHoverPID;
109 private PIDHoverType m_PIDHoverType = PIDHoverType.Ground;
110 private float m_targetHoverHeight;
111 private float m_groundHeight;
112 private float m_waterHeight;
113 private float m_buoyancy; //KF: m_buoyancy should be set by llSetBuoyancy() for non-vehicle.
114
115 // private float m_tensor = 5f;
116 private int body_autodisable_frames = 20;
117
118
119 private const CollisionCategories m_default_collisionFlags = (CollisionCategories.Geom
120 | CollisionCategories.Space
121 | CollisionCategories.Body
122 | CollisionCategories.Character
123 );
124 private bool m_taintshape;
125 private bool m_taintPhysics;
126 private bool m_collidesLand = true;
127 private bool m_collidesWater;
128 public bool m_returnCollisions;
129
130 // Default we're a Geometry
131 private CollisionCategories m_collisionCategories = (CollisionCategories.Geom);
132
133 // Default, Collide with Other Geometries, spaces and Bodies
134 private CollisionCategories m_collisionFlags = m_default_collisionFlags;
135
136 public bool m_taintremove;
137 public bool m_taintdisable;
138 public bool m_disabled;
139 public bool m_taintadd;
140 public bool m_taintselected;
141 public bool m_taintCollidesWater;
142
143 public uint m_localID;
144
145 //public GCHandle gc;
146 private CollisionLocker ode;
147
148 private bool m_taintforce = false;
149 private bool m_taintaddangularforce = false;
150 private Vector3 m_force;
151 private List<Vector3> m_forcelist = new List<Vector3>();
152 private List<Vector3> m_angularforcelist = new List<Vector3>();
153
154 private IMesh _mesh;
155 private PrimitiveBaseShape _pbs;
156 private OdeScene _parent_scene;
157 public IntPtr m_targetSpace = IntPtr.Zero;
158 public IntPtr prim_geom;
159 public IntPtr prev_geom;
160 public IntPtr _triMeshData;
161
162 private IntPtr _linkJointGroup = IntPtr.Zero;
163 private PhysicsActor _parent;
164 private PhysicsActor m_taintparent;
165
166 private List<OdePrim> childrenPrim = new List<OdePrim>();
167
168 private bool iscolliding;
169 private bool m_isphysical;
170 private bool m_isSelected;
171
172 internal bool m_isVolumeDetect; // If true, this prim only detects collisions but doesn't collide actively
173
174 private bool m_throttleUpdates;
175 private int throttleCounter;
176 public int m_interpenetrationcount;
177 public float m_collisionscore;
178 public int m_roundsUnderMotionThreshold;
179 private int m_crossingfailures;
180
181 public bool outofBounds;
182 private float m_density = 10.000006836f; // Aluminum g/cm3;
183
184 public bool _zeroFlag;
185 private bool m_lastUpdateSent;
186
187 public IntPtr Body = IntPtr.Zero;
188 public String m_primName;
189 private Vector3 _target_velocity;
190 public d.Mass pMass;
191
192 public int m_eventsubscription;
193 private CollisionEventUpdate CollisionEventsThisFrame;
194
195 private IntPtr m_linkJoint = IntPtr.Zero;
196
197 public volatile bool childPrim;
198
199 private ODEDynamics m_vehicle;
200
201 internal int m_material = (int)Material.Wood;
202
203 private int frcount = 0; // Used to limit dynamics debug output to
204
205
206 public OdePrim(String primName, OdeScene parent_scene, Vector3 pos, Vector3 size,
207 Quaternion rotation, IMesh mesh, PrimitiveBaseShape pbs, bool pisPhysical, CollisionLocker dode)
208 {
209 m_vehicle = new ODEDynamics();
210 //gc = GCHandle.Alloc(prim_geom, GCHandleType.Pinned);
211 ode = dode;
212 if (!pos.IsFinite())
213 {
214 pos = new Vector3(((float)Constants.RegionSize * 0.5f), ((float)Constants.RegionSize * 0.5f),
215 parent_scene.GetTerrainHeightAtXY(((float)Constants.RegionSize * 0.5f), ((float)Constants.RegionSize * 0.5f)) + 0.5f);
216 m_log.Warn("[PHYSICS]: Got nonFinite Object create Position");
217 }
218
219 _position = pos;
220 m_taintposition = pos;
221 PID_D = parent_scene.bodyPIDD;
222 PID_G = parent_scene.bodyPIDG;
223 m_density = parent_scene.geomDefaultDensity;
224 // m_tensor = parent_scene.bodyMotorJointMaxforceTensor;
225 body_autodisable_frames = parent_scene.bodyFramesAutoDisable;
226
227
228 prim_geom = IntPtr.Zero;
229 prev_geom = IntPtr.Zero;
230
231 if (!pos.IsFinite())
232 {
233 size = new Vector3(0.5f, 0.5f, 0.5f);
234 m_log.Warn("[PHYSICS]: Got nonFinite Object create Size");
235 }
236
237 if (size.X <= 0) size.X = 0.01f;
238 if (size.Y <= 0) size.Y = 0.01f;
239 if (size.Z <= 0) size.Z = 0.01f;
240
241 _size = size;
242 m_taintsize = _size;
243
244 if (!QuaternionIsFinite(rotation))
245 {
246 rotation = Quaternion.Identity;
247 m_log.Warn("[PHYSICS]: Got nonFinite Object create Rotation");
248 }
249
250 _orientation = rotation;
251 m_taintrot = _orientation;
252 _mesh = mesh;
253 _pbs = pbs;
254
255 _parent_scene = parent_scene;
256 m_targetSpace = (IntPtr)0;
257
258// if (pos.Z < 0)
259 if (pos.Z < parent_scene.GetTerrainHeightAtXY(pos.X, pos.Y))
260 m_isphysical = false;
261 else
262 {
263 m_isphysical = pisPhysical;
264 // If we're physical, we need to be in the master space for now.
265 // linksets *should* be in a space together.. but are not currently
266 if (m_isphysical)
267 m_targetSpace = _parent_scene.space;
268 }
269 m_primName = primName;
270 m_taintadd = true;
271 _parent_scene.AddPhysicsActorTaint(this);
272 // don't do .add() here; old geoms get recycled with the same hash
273 }
274
275 public override int PhysicsActorType
276 {
277 get { return (int) ActorTypes.Prim; }
278 set { return; }
279 }
280
281 public override bool SetAlwaysRun
282 {
283 get { return false; }
284 set { return; }
285 }
286
287 public override uint LocalID
288 {
289 set {
290 //m_log.Info("[PHYSICS]: Setting TrackerID: " + value);
291 m_localID = value; }
292 }
293
294 public override bool Grabbed
295 {
296 set { return; }
297 }
298
299 public override bool Selected
300 {
301 set {
302
303
304 // This only makes the object not collidable if the object
305 // is physical or the object is modified somehow *IN THE FUTURE*
306 // without this, if an avatar selects prim, they can walk right
307 // through it while it's selected
308 m_collisionscore = 0;
309 if ((m_isphysical && !_zeroFlag) || !value)
310 {
311 m_taintselected = value;
312 _parent_scene.AddPhysicsActorTaint(this);
313 }
314 else
315 {
316 m_taintselected = value;
317 m_isSelected = value;
318 }
319 if(m_isSelected) disableBodySoft();
320 }
321 }
322
323 public void SetGeom(IntPtr geom)
324 {
325 prev_geom = prim_geom;
326 prim_geom = geom;
327//Console.WriteLine("SetGeom to " + prim_geom + " for " + m_primName);
328 if (prim_geom != IntPtr.Zero)
329 {
330 d.GeomSetCategoryBits(prim_geom, (int)m_collisionCategories);
331 d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
332 }
333
334 if (childPrim)
335 {
336 if (_parent != null && _parent is OdePrim)
337 {
338 OdePrim parent = (OdePrim)_parent;
339//Console.WriteLine("SetGeom calls ChildSetGeom");
340 parent.ChildSetGeom(this);
341 }
342 }
343 //m_log.Warn("Setting Geom to: " + prim_geom);
344 }
345
346
347
348 public void enableBodySoft()
349 {
350 if (!childPrim)
351 {
352 if (m_isphysical && Body != IntPtr.Zero)
353 {
354 d.BodyEnable(Body);
355 if (m_vehicle.Type != Vehicle.TYPE_NONE)
356 m_vehicle.Enable(Body, _parent_scene);
357 }
358
359 m_disabled = false;
360 }
361 }
362
363 public void disableBodySoft()
364 {
365 m_disabled = true;
366
367 if (m_isphysical && Body != IntPtr.Zero)
368 {
369 d.BodyDisable(Body);
370 }
371 }
372
373 public void enableBody()
374 {
375 // Don't enable this body if we're a child prim
376 // this should be taken care of in the parent function not here
377 if (!childPrim)
378 {
379 // Sets the geom to a body
380 Body = d.BodyCreate(_parent_scene.world);
381
382 setMass();
383 d.BodySetPosition(Body, _position.X, _position.Y, _position.Z);
384 d.Quaternion myrot = new d.Quaternion();
385 myrot.X = _orientation.X;
386 myrot.Y = _orientation.Y;
387 myrot.Z = _orientation.Z;
388 myrot.W = _orientation.W;
389 d.BodySetQuaternion(Body, ref myrot);
390 d.GeomSetBody(prim_geom, Body);
391 m_collisionCategories |= CollisionCategories.Body;
392 m_collisionFlags |= (CollisionCategories.Land | CollisionCategories.Wind);
393
394 d.GeomSetCategoryBits(prim_geom, (int)m_collisionCategories);
395 d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
396
397 d.BodySetAutoDisableFlag(Body, true);
398 d.BodySetAutoDisableSteps(Body, body_autodisable_frames);
399
400 // disconnect from world gravity so we can apply buoyancy
401 d.BodySetGravityMode (Body, false);
402
403 m_interpenetrationcount = 0;
404 m_collisionscore = 0;
405 m_disabled = false;
406
407 // The body doesn't already have a finite rotation mode set here
408 if ((!m_angularlock.ApproxEquals(Vector3.Zero, 0.0f)) && _parent == null)
409 {
410 createAMotor(m_angularlock);
411 }
412 if (m_vehicle.Type != Vehicle.TYPE_NONE)
413 {
414 m_vehicle.Enable(Body, _parent_scene);
415 }
416
417 _parent_scene.addActivePrim(this);
418 }
419 }
420
421 #region Mass Calculation
422
423 private float CalculateMass()
424 {
425 float volume = 0;
426
427 // No material is passed to the physics engines yet.. soo..
428 // we're using the m_density constant in the class definition
429
430 float returnMass = 0;
431
432 switch (_pbs.ProfileShape)
433 {
434 case ProfileShape.Square:
435 // Profile Volume
436
437 volume = _size.X*_size.Y*_size.Z;
438
439 // If the user has 'hollowed out'
440 // ProfileHollow is one of those 0 to 50000 values :P
441 // we like percentages better.. so turning into a percentage
442
443 if (((float) _pbs.ProfileHollow/50000f) > 0.0)
444 {
445 float hollowAmount = (float) _pbs.ProfileHollow/50000f;
446
447 // calculate the hollow volume by it's shape compared to the prim shape
448 float hollowVolume = 0;
449 switch (_pbs.HollowShape)
450 {
451 case HollowShape.Square:
452 case HollowShape.Same:
453 // Cube Hollow volume calculation
454 float hollowsizex = _size.X*hollowAmount;
455 float hollowsizey = _size.Y*hollowAmount;
456 float hollowsizez = _size.Z*hollowAmount;
457 hollowVolume = hollowsizex*hollowsizey*hollowsizez;
458 break;
459
460 case HollowShape.Circle:
461 // Hollow shape is a perfect cyllinder in respect to the cube's scale
462 // Cyllinder hollow volume calculation
463 float hRadius = _size.X/2;
464 float hLength = _size.Z;
465
466 // pi * r2 * h
467 hollowVolume = ((float) (Math.PI*Math.Pow(hRadius, 2)*hLength)*hollowAmount);
468 break;
469
470 case HollowShape.Triangle:
471 // Equilateral Triangular Prism volume hollow calculation
472 // Triangle is an Equilateral Triangular Prism with aLength = to _size.Y
473
474 float aLength = _size.Y;
475 // 1/2 abh
476 hollowVolume = (float) ((0.5*aLength*_size.X*_size.Z)*hollowAmount);
477 break;
478
479 default:
480 hollowVolume = 0;
481 break;
482 }
483 volume = volume - hollowVolume;
484 }
485
486 break;
487 case ProfileShape.Circle:
488 if (_pbs.PathCurve == (byte)Extrusion.Straight)
489 {
490 // Cylinder
491 float volume1 = (float)(Math.PI * Math.Pow(_size.X/2, 2) * _size.Z);
492 float volume2 = (float)(Math.PI * Math.Pow(_size.Y/2, 2) * _size.Z);
493
494 // Approximating the cylinder's irregularity.
495 if (volume1 > volume2)
496 {
497 volume = (float)volume1 - (volume1 - volume2);
498 }
499 else if (volume2 > volume1)
500 {
501 volume = (float)volume2 - (volume2 - volume1);
502 }
503 else
504 {
505 // Regular cylinder
506 volume = volume1;
507 }
508 }
509 else
510 {
511 // We don't know what the shape is yet, so use default
512 volume = _size.X * _size.Y * _size.Z;
513 }
514 // If the user has 'hollowed out'
515 // ProfileHollow is one of those 0 to 50000 values :P
516 // we like percentages better.. so turning into a percentage
517
518 if (((float)_pbs.ProfileHollow / 50000f) > 0.0)
519 {
520 float hollowAmount = (float)_pbs.ProfileHollow / 50000f;
521
522 // calculate the hollow volume by it's shape compared to the prim shape
523 float hollowVolume = 0;
524 switch (_pbs.HollowShape)
525 {
526 case HollowShape.Same:
527 case HollowShape.Circle:
528 // Hollow shape is a perfect cyllinder in respect to the cube's scale
529 // Cyllinder hollow volume calculation
530 float hRadius = _size.X / 2;
531 float hLength = _size.Z;
532
533 // pi * r2 * h
534 hollowVolume = ((float)(Math.PI * Math.Pow(hRadius, 2) * hLength) * hollowAmount);
535 break;
536
537 case HollowShape.Square:
538 // Cube Hollow volume calculation
539 float hollowsizex = _size.X * hollowAmount;
540 float hollowsizey = _size.Y * hollowAmount;
541 float hollowsizez = _size.Z * hollowAmount;
542 hollowVolume = hollowsizex * hollowsizey * hollowsizez;
543 break;
544
545 case HollowShape.Triangle:
546 // Equilateral Triangular Prism volume hollow calculation
547 // Triangle is an Equilateral Triangular Prism with aLength = to _size.Y
548
549 float aLength = _size.Y;
550 // 1/2 abh
551 hollowVolume = (float)((0.5 * aLength * _size.X * _size.Z) * hollowAmount);
552 break;
553
554 default:
555 hollowVolume = 0;
556 break;
557 }
558 volume = volume - hollowVolume;
559 }
560 break;
561
562 case ProfileShape.HalfCircle:
563 if (_pbs.PathCurve == (byte)Extrusion.Curve1)
564 {
565 if (_size.X == _size.Y && _size.Y == _size.Z)
566 {
567 // regular sphere
568 // v = 4/3 * pi * r^3
569 float sradius3 = (float)Math.Pow((_size.X / 2), 3);
570 volume = (float)((4f / 3f) * Math.PI * sradius3);
571 }
572 else
573 {
574 // we treat this as a box currently
575 volume = _size.X * _size.Y * _size.Z;
576 }
577 }
578 else
579 {
580 // We don't know what the shape is yet, so use default
581 volume = _size.X * _size.Y * _size.Z;
582 }
583 break;
584
585 case ProfileShape.EquilateralTriangle:
586 /*
587 v = (abs((xB*yA-xA*yB)+(xC*yB-xB*yC)+(xA*yC-xC*yA))/2) * h
588
589 // seed mesh
590 Vertex MM = new Vertex(-0.25f, -0.45f, 0.0f);
591 Vertex PM = new Vertex(+0.5f, 0f, 0.0f);
592 Vertex PP = new Vertex(-0.25f, +0.45f, 0.0f);
593 */
594 float xA = -0.25f * _size.X;
595 float yA = -0.45f * _size.Y;
596
597 float xB = 0.5f * _size.X;
598 float yB = 0;
599
600 float xC = -0.25f * _size.X;
601 float yC = 0.45f * _size.Y;
602
603 volume = (float)((Math.Abs((xB * yA - xA * yB) + (xC * yB - xB * yC) + (xA * yC - xC * yA)) / 2) * _size.Z);
604
605 // If the user has 'hollowed out'
606 // ProfileHollow is one of those 0 to 50000 values :P
607 // we like percentages better.. so turning into a percentage
608 float fhollowFactor = ((float)_pbs.ProfileHollow / 1.9f);
609 if (((float)fhollowFactor / 50000f) > 0.0)
610 {
611 float hollowAmount = (float)fhollowFactor / 50000f;
612
613 // calculate the hollow volume by it's shape compared to the prim shape
614 float hollowVolume = 0;
615 switch (_pbs.HollowShape)
616 {
617 case HollowShape.Same:
618 case HollowShape.Triangle:
619 // Equilateral Triangular Prism volume hollow calculation
620 // Triangle is an Equilateral Triangular Prism with aLength = to _size.Y
621
622 float aLength = _size.Y;
623 // 1/2 abh
624 hollowVolume = (float)((0.5 * aLength * _size.X * _size.Z) * hollowAmount);
625 break;
626
627 case HollowShape.Square:
628 // Cube Hollow volume calculation
629 float hollowsizex = _size.X * hollowAmount;
630 float hollowsizey = _size.Y * hollowAmount;
631 float hollowsizez = _size.Z * hollowAmount;
632 hollowVolume = hollowsizex * hollowsizey * hollowsizez;
633 break;
634
635 case HollowShape.Circle:
636 // Hollow shape is a perfect cyllinder in respect to the cube's scale
637 // Cyllinder hollow volume calculation
638 float hRadius = _size.X / 2;
639 float hLength = _size.Z;
640
641 // pi * r2 * h
642 hollowVolume = ((float)((Math.PI * Math.Pow(hRadius, 2) * hLength)/2) * hollowAmount);
643 break;
644
645 default:
646 hollowVolume = 0;
647 break;
648 }
649 volume = volume - hollowVolume;
650 }
651 break;
652
653 default:
654 // we don't have all of the volume formulas yet so
655 // use the common volume formula for all
656 volume = _size.X*_size.Y*_size.Z;
657 break;
658 }
659
660 // Calculate Path cut effect on volume
661 // Not exact, in the triangle hollow example
662 // They should never be zero or less then zero..
663 // we'll ignore it if it's less then zero
664
665 // ProfileEnd and ProfileBegin are values
666 // from 0 to 50000
667
668 // Turning them back into percentages so that I can cut that percentage off the volume
669
670 float PathCutEndAmount = _pbs.ProfileEnd;
671 float PathCutStartAmount = _pbs.ProfileBegin;
672 if (((PathCutStartAmount + PathCutEndAmount)/50000f) > 0.0f)
673 {
674 float pathCutAmount = ((PathCutStartAmount + PathCutEndAmount)/50000f);
675
676 // Check the return amount for sanity
677 if (pathCutAmount >= 0.99f)
678 pathCutAmount = 0.99f;
679
680 volume = volume - (volume*pathCutAmount);
681 }
682 UInt16 taperX = _pbs.PathScaleX;
683 UInt16 taperY = _pbs.PathScaleY;
684 float taperFactorX = 0;
685 float taperFactorY = 0;
686
687 // Mass = density * volume
688 if (taperX != 100)
689 {
690 if (taperX > 100)
691 {
692 taperFactorX = 1.0f - ((float)taperX / 200);
693 //m_log.Warn("taperTopFactorX: " + extr.taperTopFactorX.ToString());
694 }
695 else
696 {
697 taperFactorX = 1.0f - ((100 - (float)taperX) / 100);
698 //m_log.Warn("taperBotFactorX: " + extr.taperBotFactorX.ToString());
699 }
700 volume = (float)volume * ((taperFactorX / 3f) + 0.001f);
701 }
702
703 if (taperY != 100)
704 {
705 if (taperY > 100)
706 {
707 taperFactorY = 1.0f - ((float)taperY / 200);
708 //m_log.Warn("taperTopFactorY: " + extr.taperTopFactorY.ToString());
709 }
710 else
711 {
712 taperFactorY = 1.0f - ((100 - (float)taperY) / 100);
713 //m_log.Warn("taperBotFactorY: " + extr.taperBotFactorY.ToString());
714 }
715 volume = (float)volume * ((taperFactorY / 3f) + 0.001f);
716 }
717 returnMass = m_density*volume;
718 if (returnMass <= 0) returnMass = 0.0001f;//ckrinke: Mass must be greater then zero.
719
720
721
722 // Recursively calculate mass
723 bool HasChildPrim = false;
724 lock (childrenPrim)
725 {
726 if (childrenPrim.Count > 0)
727 {
728 HasChildPrim = true;
729 }
730
731 }
732 if (HasChildPrim)
733 {
734 OdePrim[] childPrimArr = new OdePrim[0];
735
736 lock (childrenPrim)
737 childPrimArr = childrenPrim.ToArray();
738
739 for (int i = 0; i < childPrimArr.Length; i++)
740 {
741 if (childPrimArr[i] != null && !childPrimArr[i].m_taintremove)
742 returnMass += childPrimArr[i].CalculateMass();
743 // failsafe, this shouldn't happen but with OpenSim, you never know :)
744 if (i > 256)
745 break;
746 }
747 }
748 if (returnMass > _parent_scene.maximumMassObject)
749 returnMass = _parent_scene.maximumMassObject;
750 return returnMass;
751 }// end CalculateMass
752
753 #endregion
754
755 public void setMass()
756 {
757 if (Body != (IntPtr) 0)
758 {
759 float newmass = CalculateMass();
760
761 //m_log.Info("[PHYSICS]: New Mass: " + newmass.ToString());
762
763 d.MassSetBoxTotal(out pMass, newmass, _size.X, _size.Y, _size.Z);
764 d.BodySetMass(Body, ref pMass);
765 }
766 }
767
768 public void disableBody()
769 {
770 //this kills the body so things like 'mesh' can re-create it.
771 lock (this)
772 {
773 if (!childPrim)
774 {
775 if (Body != IntPtr.Zero)
776 {
777 _parent_scene.remActivePrim(this);
778 m_collisionCategories &= ~CollisionCategories.Body;
779 m_collisionFlags &= ~(CollisionCategories.Wind | CollisionCategories.Land);
780
781 if (prim_geom != IntPtr.Zero)
782 {
783 d.GeomSetCategoryBits(prim_geom, (int)m_collisionCategories);
784 d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
785 }
786
787
788 d.BodyDestroy(Body);
789 lock (childrenPrim)
790 {
791 if (childrenPrim.Count > 0)
792 {
793 foreach (OdePrim prm in childrenPrim)
794 {
795 _parent_scene.remActivePrim(prm);
796 prm.Body = IntPtr.Zero;
797 }
798 }
799 }
800 Body = IntPtr.Zero;
801 }
802 }
803 else
804 {
805 _parent_scene.remActivePrim(this);
806
807 m_collisionCategories &= ~CollisionCategories.Body;
808 m_collisionFlags &= ~(CollisionCategories.Wind | CollisionCategories.Land);
809
810 if (prim_geom != IntPtr.Zero)
811 {
812 d.GeomSetCategoryBits(prim_geom, (int)m_collisionCategories);
813 d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
814 }
815
816
817 Body = IntPtr.Zero;
818 }
819 }
820 m_disabled = true;
821 m_collisionscore = 0;
822 }
823
824 private static Dictionary<IMesh, IntPtr> m_MeshToTriMeshMap = new Dictionary<IMesh, IntPtr>();
825
826 public void setMesh(OdeScene parent_scene, IMesh mesh)
827 {
828 // This sleeper is there to moderate how long it takes between
829 // setting up the mesh and pre-processing it when we get rapid fire mesh requests on a single object
830
831 //Thread.Sleep(10);
832
833 //Kill Body so that mesh can re-make the geom
834 if (IsPhysical && Body != IntPtr.Zero)
835 {
836 if (childPrim)
837 {
838 if (_parent != null)
839 {
840 OdePrim parent = (OdePrim)_parent;
841 parent.ChildDelink(this);
842 }
843 }
844 else
845 {
846 disableBody();
847 }
848 }
849
850 IntPtr vertices, indices;
851 int vertexCount, indexCount;
852 int vertexStride, triStride;
853 mesh.getVertexListAsPtrToFloatArray(out vertices, out vertexStride, out vertexCount); // Note, that vertices are fixed in unmanaged heap
854 mesh.getIndexListAsPtrToIntArray(out indices, out triStride, out indexCount); // Also fixed, needs release after usage
855
856 mesh.releaseSourceMeshData(); // free up the original mesh data to save memory
857 if (m_MeshToTriMeshMap.ContainsKey(mesh))
858 {
859 _triMeshData = m_MeshToTriMeshMap[mesh];
860 }
861 else
862 {
863 _triMeshData = d.GeomTriMeshDataCreate();
864
865 d.GeomTriMeshDataBuildSimple(_triMeshData, vertices, vertexStride, vertexCount, indices, indexCount, triStride);
866 d.GeomTriMeshDataPreprocess(_triMeshData);
867 m_MeshToTriMeshMap[mesh] = _triMeshData;
868 }
869
870 _parent_scene.waitForSpaceUnlock(m_targetSpace);
871 try
872 {
873 if (prim_geom == IntPtr.Zero)
874 {
875 SetGeom(d.CreateTriMesh(m_targetSpace, _triMeshData, parent_scene.triCallback, null, null));
876 }
877 }
878 catch (AccessViolationException)
879 {
880 m_log.Error("[PHYSICS]: MESH LOCKED");
881 return;
882 }
883
884
885 // if (IsPhysical && Body == (IntPtr) 0)
886 // {
887 // Recreate the body
888 // m_interpenetrationcount = 0;
889 // m_collisionscore = 0;
890
891 // enableBody();
892 // }
893 }
894
895 public void ProcessTaints(float timestep)
896 {
897//Console.WriteLine("ProcessTaints for " + m_primName );
898 if (m_taintadd)
899 {
900 changeadd(timestep);
901 }
902
903 if (prim_geom != IntPtr.Zero)
904 {
905 if (!_position.ApproxEquals(m_taintposition, 0f))
906 changemove(timestep);
907
908 if (m_taintrot != _orientation)
909 {
910 if(childPrim && IsPhysical) // For physical child prim...
911 {
912 rotate(timestep);
913 // KF: ODE will also rotate the parent prim!
914 // so rotate the root back to where it was
915 OdePrim parent = (OdePrim)_parent;
916 parent.rotate(timestep);
917 }
918 else
919 {
920 //Just rotate the prim
921 rotate(timestep);
922 }
923 }
924 //
925
926 if (m_taintPhysics != m_isphysical && !(m_taintparent != _parent))
927 changePhysicsStatus(timestep);
928 //
929
930 if (!_size.ApproxEquals(m_taintsize,0f))
931 changesize(timestep);
932 //
933
934 if (m_taintshape)
935 changeshape(timestep);
936 //
937
938 if (m_taintforce)
939 changeAddForce(timestep);
940
941 if (m_taintaddangularforce)
942 changeAddAngularForce(timestep);
943
944 if (!m_taintTorque.ApproxEquals(Vector3.Zero, 0.001f))
945 changeSetTorque(timestep);
946
947 if (m_taintdisable)
948 changedisable(timestep);
949
950 if (m_taintselected != m_isSelected)
951 changeSelectedStatus(timestep);
952
953 if (!m_taintVelocity.ApproxEquals(Vector3.Zero, 0.001f))
954 changevelocity(timestep);
955
956 if (m_taintparent != _parent)
957 changelink(timestep);
958
959 if (m_taintCollidesWater != m_collidesWater)
960 changefloatonwater(timestep);
961
962 if (!m_angularlock.ApproxEquals(m_taintAngularLock,0f))
963 changeAngularLock(timestep);
964
965 }
966 else
967 {
968 m_log.Error("[PHYSICS]: The scene reused a disposed PhysActor! *waves finger*, Don't be evil. A couple of things can cause this. An improper prim breakdown(be sure to set prim_geom to zero after d.GeomDestroy! An improper buildup (creating the geom failed). Or, the Scene Reused a physics actor after disposing it.)");
969 }
970 }
971
972
973 private void changeAngularLock(float timestep)
974 {
975 // do we have a Physical object?
976 if (Body != IntPtr.Zero)
977 {
978 //Check that we have a Parent
979 //If we have a parent then we're not authorative here
980 if (_parent == null)
981 {
982 if (!m_taintAngularLock.ApproxEquals(Vector3.One, 0f))
983 {
984 //d.BodySetFiniteRotationMode(Body, 0);
985 //d.BodySetFiniteRotationAxis(Body,m_taintAngularLock.X,m_taintAngularLock.Y,m_taintAngularLock.Z);
986 createAMotor(m_taintAngularLock);
987 }
988 else
989 {
990 if (Amotor != IntPtr.Zero)
991 {
992 d.JointDestroy(Amotor);
993 Amotor = IntPtr.Zero;
994 }
995 }
996 }
997 }
998 // Store this for later in case we get turned into a separate body
999 m_angularlock = m_taintAngularLock;
1000
1001 }
1002
1003 private void changelink(float timestep)
1004 {
1005 // If the newly set parent is not null
1006 // create link
1007 if (_parent == null && m_taintparent != null)
1008 {
1009 if (m_taintparent.PhysicsActorType == (int)ActorTypes.Prim)
1010 {
1011 OdePrim obj = (OdePrim)m_taintparent;
1012 //obj.disableBody();
1013//Console.WriteLine("changelink calls ParentPrim");
1014 obj.ParentPrim(this);
1015
1016 /*
1017 if (obj.Body != (IntPtr)0 && Body != (IntPtr)0 && obj.Body != Body)
1018 {
1019 _linkJointGroup = d.JointGroupCreate(0);
1020 m_linkJoint = d.JointCreateFixed(_parent_scene.world, _linkJointGroup);
1021 d.JointAttach(m_linkJoint, obj.Body, Body);
1022 d.JointSetFixed(m_linkJoint);
1023 }
1024 */
1025 }
1026 }
1027 // If the newly set parent is null
1028 // destroy link
1029 else if (_parent != null && m_taintparent == null)
1030 {
1031//Console.WriteLine(" changelink B");
1032
1033 if (_parent is OdePrim)
1034 {
1035 OdePrim obj = (OdePrim)_parent;
1036 obj.ChildDelink(this);
1037 childPrim = false;
1038 //_parent = null;
1039 }
1040
1041 /*
1042 if (Body != (IntPtr)0 && _linkJointGroup != (IntPtr)0)
1043 d.JointGroupDestroy(_linkJointGroup);
1044
1045 _linkJointGroup = (IntPtr)0;
1046 m_linkJoint = (IntPtr)0;
1047 */
1048 }
1049
1050 _parent = m_taintparent;
1051 m_taintPhysics = m_isphysical;
1052 }
1053
1054 // I'm the parent
1055 // prim is the child
1056 public void ParentPrim(OdePrim prim)
1057 {
1058//Console.WriteLine("ParentPrim " + m_primName);
1059 if (this.m_localID != prim.m_localID)
1060 {
1061 if (Body == IntPtr.Zero)
1062 {
1063 Body = d.BodyCreate(_parent_scene.world);
1064 setMass();
1065 }
1066 if (Body != IntPtr.Zero)
1067 {
1068 lock (childrenPrim)
1069 {
1070 if (!childrenPrim.Contains(prim))
1071 {
1072//Console.WriteLine("childrenPrim.Add " + prim);
1073 childrenPrim.Add(prim);
1074
1075 foreach (OdePrim prm in childrenPrim)
1076 {
1077 d.Mass m2;
1078 d.MassSetZero(out m2);
1079 d.MassSetBoxTotal(out m2, prim.CalculateMass(), prm._size.X, prm._size.Y, prm._size.Z);
1080
1081
1082 d.Quaternion quat = new d.Quaternion();
1083 quat.W = prm._orientation.W;
1084 quat.X = prm._orientation.X;
1085 quat.Y = prm._orientation.Y;
1086 quat.Z = prm._orientation.Z;
1087
1088 d.Matrix3 mat = new d.Matrix3();
1089 d.RfromQ(out mat, ref quat);
1090 d.MassRotate(ref m2, ref mat);
1091 d.MassTranslate(ref m2, Position.X - prm.Position.X, Position.Y - prm.Position.Y, Position.Z - prm.Position.Z);
1092 d.MassAdd(ref pMass, ref m2);
1093 }
1094 foreach (OdePrim prm in childrenPrim)
1095 {
1096
1097 prm.m_collisionCategories |= CollisionCategories.Body;
1098 prm.m_collisionFlags |= (CollisionCategories.Land | CollisionCategories.Wind);
1099
1100 if (prm.prim_geom == IntPtr.Zero)
1101 {
1102 m_log.Warn("[PHYSICS]: Unable to link one of the linkset elements. No geom yet");
1103 continue;
1104 }
1105//Console.WriteLine(" GeomSetCategoryBits 1: " + prm.prim_geom + " - " + (int)prm.m_collisionCategories + " for " + m_primName);
1106 d.GeomSetCategoryBits(prm.prim_geom, (int)prm.m_collisionCategories);
1107 d.GeomSetCollideBits(prm.prim_geom, (int)prm.m_collisionFlags);
1108
1109
1110 d.Quaternion quat = new d.Quaternion();
1111 quat.W = prm._orientation.W;
1112 quat.X = prm._orientation.X;
1113 quat.Y = prm._orientation.Y;
1114 quat.Z = prm._orientation.Z;
1115
1116 d.Matrix3 mat = new d.Matrix3();
1117 d.RfromQ(out mat, ref quat);
1118 if (Body != IntPtr.Zero)
1119 {
1120 d.GeomSetBody(prm.prim_geom, Body);
1121 prm.childPrim = true;
1122 d.GeomSetOffsetWorldPosition(prm.prim_geom, prm.Position.X , prm.Position.Y, prm.Position.Z);
1123 //d.GeomSetOffsetPosition(prim.prim_geom,
1124 // (Position.X - prm.Position.X) - pMass.c.X,
1125 // (Position.Y - prm.Position.Y) - pMass.c.Y,
1126 // (Position.Z - prm.Position.Z) - pMass.c.Z);
1127 d.GeomSetOffsetWorldRotation(prm.prim_geom, ref mat);
1128 //d.GeomSetOffsetRotation(prm.prim_geom, ref mat);
1129 d.MassTranslate(ref pMass, -pMass.c.X, -pMass.c.Y, -pMass.c.Z);
1130 d.BodySetMass(Body, ref pMass);
1131 }
1132 else
1133 {
1134 m_log.Debug("[PHYSICS]:I ain't got no boooooooooddy, no body");
1135 }
1136
1137
1138 prm.m_interpenetrationcount = 0;
1139 prm.m_collisionscore = 0;
1140 prm.m_disabled = false;
1141
1142 // The body doesn't already have a finite rotation mode set here
1143 if ((!m_angularlock.ApproxEquals(Vector3.Zero, 0f)) && _parent == null)
1144 {
1145 prm.createAMotor(m_angularlock);
1146 }
1147 prm.Body = Body;
1148 _parent_scene.addActivePrim(prm);
1149 }
1150 m_collisionCategories |= CollisionCategories.Body;
1151 m_collisionFlags |= (CollisionCategories.Land | CollisionCategories.Wind);
1152
1153//Console.WriteLine("GeomSetCategoryBits 2: " + prim_geom + " - " + (int)m_collisionCategories + " for " + m_primName);
1154 d.GeomSetCategoryBits(prim_geom, (int)m_collisionCategories);
1155//Console.WriteLine(" Post GeomSetCategoryBits 2");
1156 d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
1157
1158
1159 d.Quaternion quat2 = new d.Quaternion();
1160 quat2.W = _orientation.W;
1161 quat2.X = _orientation.X;
1162 quat2.Y = _orientation.Y;
1163 quat2.Z = _orientation.Z;
1164
1165 d.Matrix3 mat2 = new d.Matrix3();
1166 d.RfromQ(out mat2, ref quat2);
1167 d.GeomSetBody(prim_geom, Body);
1168 d.GeomSetOffsetWorldPosition(prim_geom, Position.X - pMass.c.X, Position.Y - pMass.c.Y, Position.Z - pMass.c.Z);
1169 //d.GeomSetOffsetPosition(prim.prim_geom,
1170 // (Position.X - prm.Position.X) - pMass.c.X,
1171 // (Position.Y - prm.Position.Y) - pMass.c.Y,
1172 // (Position.Z - prm.Position.Z) - pMass.c.Z);
1173 //d.GeomSetOffsetRotation(prim_geom, ref mat2);
1174 d.MassTranslate(ref pMass, -pMass.c.X, -pMass.c.Y, -pMass.c.Z);
1175 d.BodySetMass(Body, ref pMass);
1176
1177 d.BodySetAutoDisableFlag(Body, true);
1178 d.BodySetAutoDisableSteps(Body, body_autodisable_frames);
1179
1180
1181 m_interpenetrationcount = 0;
1182 m_collisionscore = 0;
1183 m_disabled = false;
1184
1185 // The body doesn't already have a finite rotation mode set here
1186 if ((!m_angularlock.ApproxEquals(Vector3.Zero, 0f)) && _parent == null)
1187 {
1188 createAMotor(m_angularlock);
1189 }
1190 d.BodySetPosition(Body, Position.X, Position.Y, Position.Z);
1191 if (m_vehicle.Type != Vehicle.TYPE_NONE) m_vehicle.Enable(Body, _parent_scene);
1192 _parent_scene.addActivePrim(this);
1193 }
1194 }
1195 }
1196 }
1197
1198 }
1199
1200 private void ChildSetGeom(OdePrim odePrim)
1201 {
1202 //if (m_isphysical && Body != IntPtr.Zero)
1203 lock (childrenPrim)
1204 {
1205 foreach (OdePrim prm in childrenPrim)
1206 {
1207 //prm.childPrim = true;
1208 prm.disableBody();
1209 //prm.m_taintparent = null;
1210 //prm._parent = null;
1211 //prm.m_taintPhysics = false;
1212 //prm.m_disabled = true;
1213 //prm.childPrim = false;
1214 }
1215 }
1216 disableBody();
1217
1218
1219 if (Body != IntPtr.Zero)
1220 {
1221 _parent_scene.remActivePrim(this);
1222 }
1223
1224 lock (childrenPrim)
1225 {
1226 foreach (OdePrim prm in childrenPrim)
1227 {
1228//Console.WriteLine("ChildSetGeom calls ParentPrim");
1229 ParentPrim(prm);
1230 }
1231 }
1232
1233 }
1234
1235 private void ChildDelink(OdePrim odePrim)
1236 {
1237 // Okay, we have a delinked child.. need to rebuild the body.
1238 lock (childrenPrim)
1239 {
1240 foreach (OdePrim prm in childrenPrim)
1241 {
1242 prm.childPrim = true;
1243 prm.disableBody();
1244 //prm.m_taintparent = null;
1245 //prm._parent = null;
1246 //prm.m_taintPhysics = false;
1247 //prm.m_disabled = true;
1248 //prm.childPrim = false;
1249 }
1250 }
1251 disableBody();
1252
1253 lock (childrenPrim)
1254 {
1255 //Console.WriteLine("childrenPrim.Remove " + odePrim);
1256 childrenPrim.Remove(odePrim);
1257 }
1258
1259
1260
1261
1262 if (Body != IntPtr.Zero)
1263 {
1264 _parent_scene.remActivePrim(this);
1265 }
1266
1267
1268
1269 lock (childrenPrim)
1270 {
1271 foreach (OdePrim prm in childrenPrim)
1272 {
1273//Console.WriteLine("ChildDelink calls ParentPrim");
1274 ParentPrim(prm);
1275 }
1276 }
1277
1278
1279 }
1280
1281 private void changeSelectedStatus(float timestep)
1282 {
1283 if (m_taintselected)
1284 {
1285 m_collisionCategories = CollisionCategories.Selected;
1286 m_collisionFlags = (CollisionCategories.Sensor | CollisionCategories.Space);
1287
1288 // We do the body disable soft twice because 'in theory' a collision could have happened
1289 // in between the disabling and the collision properties setting
1290 // which would wake the physical body up from a soft disabling and potentially cause it to fall
1291 // through the ground.
1292
1293 // NOTE FOR JOINTS: this doesn't always work for jointed assemblies because if you select
1294 // just one part of the assembly, the rest of the assembly is non-selected and still simulating,
1295 // so that causes the selected part to wake up and continue moving.
1296
1297 // even if you select all parts of a jointed assembly, it is not guaranteed that the entire
1298 // assembly will stop simulating during the selection, because of the lack of atomicity
1299 // of select operations (their processing could be interrupted by a thread switch, causing
1300 // simulation to continue before all of the selected object notifications trickle down to
1301 // the physics engine).
1302
1303 // e.g. we select 100 prims that are connected by joints. non-atomically, the first 50 are
1304 // selected and disabled. then, due to a thread switch, the selection processing is
1305 // interrupted and the physics engine continues to simulate, so the last 50 items, whose
1306 // selection was not yet processed, continues to simulate. this wakes up ALL of the
1307 // first 50 again. then the last 50 are disabled. then the first 50, which were just woken
1308 // up, start simulating again, which in turn wakes up the last 50.
1309
1310 if (m_isphysical)
1311 {
1312 disableBodySoft();
1313 }
1314
1315 if (prim_geom != IntPtr.Zero)
1316 {
1317 d.GeomSetCategoryBits(prim_geom, (int)m_collisionCategories);
1318 d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
1319 }
1320
1321 if (m_isphysical)
1322 {
1323 disableBodySoft();
1324 }
1325 }
1326 else
1327 {
1328 m_collisionCategories = CollisionCategories.Geom;
1329
1330 if (m_isphysical)
1331 m_collisionCategories |= CollisionCategories.Body;
1332
1333 m_collisionFlags = m_default_collisionFlags;
1334
1335 if (m_collidesLand)
1336 m_collisionFlags |= CollisionCategories.Land;
1337 if (m_collidesWater)
1338 m_collisionFlags |= CollisionCategories.Water;
1339
1340 if (prim_geom != IntPtr.Zero)
1341 {
1342 d.GeomSetCategoryBits(prim_geom, (int)m_collisionCategories);
1343 d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
1344 }
1345 if (m_isphysical)
1346 {
1347 if (Body != IntPtr.Zero)
1348 {
1349 d.BodySetLinearVel(Body, 0f, 0f, 0f);
1350 d.BodySetForce(Body, 0, 0, 0);
1351 enableBodySoft();
1352 }
1353 }
1354 }
1355
1356 resetCollisionAccounting();
1357 m_isSelected = m_taintselected;
1358 }//end changeSelectedStatus
1359
1360 public void ResetTaints()
1361 {
1362 m_taintposition = _position;
1363 m_taintrot = _orientation;
1364 m_taintPhysics = m_isphysical;
1365 m_taintselected = m_isSelected;
1366 m_taintsize = _size;
1367 m_taintshape = false;
1368 m_taintforce = false;
1369 m_taintdisable = false;
1370 m_taintVelocity = Vector3.Zero;
1371 }
1372
1373 public void CreateGeom(IntPtr m_targetSpace, IMesh _mesh)
1374 {
1375//Console.WriteLine("CreateGeom:");
1376 if (_mesh != null)
1377 {
1378 setMesh(_parent_scene, _mesh);
1379 }
1380 else
1381 {
1382 if (_pbs.ProfileShape == ProfileShape.HalfCircle && _pbs.PathCurve == (byte)Extrusion.Curve1)
1383 {
1384 if (_size.X == _size.Y && _size.Y == _size.Z && _size.X == _size.Z)
1385 {
1386 if (((_size.X / 2f) > 0f))
1387 {
1388 _parent_scene.waitForSpaceUnlock(m_targetSpace);
1389 try
1390 {
1391//Console.WriteLine(" CreateGeom 1");
1392 SetGeom(d.CreateSphere(m_targetSpace, _size.X / 2));
1393 }
1394 catch (AccessViolationException)
1395 {
1396 m_log.Warn("[PHYSICS]: Unable to create physics proxy for object");
1397 ode.dunlock(_parent_scene.world);
1398 return;
1399 }
1400 }
1401 else
1402 {
1403 _parent_scene.waitForSpaceUnlock(m_targetSpace);
1404 try
1405 {
1406//Console.WriteLine(" CreateGeom 2");
1407 SetGeom(d.CreateBox(m_targetSpace, _size.X, _size.Y, _size.Z));
1408 }
1409 catch (AccessViolationException)
1410 {
1411 m_log.Warn("[PHYSICS]: Unable to create physics proxy for object");
1412 ode.dunlock(_parent_scene.world);
1413 return;
1414 }
1415 }
1416 }
1417 else
1418 {
1419 _parent_scene.waitForSpaceUnlock(m_targetSpace);
1420 try
1421 {
1422//Console.WriteLine(" CreateGeom 3");
1423 SetGeom(d.CreateBox(m_targetSpace, _size.X, _size.Y, _size.Z));
1424 }
1425 catch (AccessViolationException)
1426 {
1427 m_log.Warn("[PHYSICS]: Unable to create physics proxy for object");
1428 ode.dunlock(_parent_scene.world);
1429 return;
1430 }
1431 }
1432 }
1433
1434 else
1435 {
1436 _parent_scene.waitForSpaceUnlock(m_targetSpace);
1437 try
1438 {
1439//Console.WriteLine(" CreateGeom 4");
1440 SetGeom(d.CreateBox(m_targetSpace, _size.X, _size.Y, _size.Z));
1441 }
1442 catch (AccessViolationException)
1443 {
1444 m_log.Warn("[PHYSICS]: Unable to create physics proxy for object");
1445 ode.dunlock(_parent_scene.world);
1446 return;
1447 }
1448 }
1449 }
1450 }
1451
1452 public void changeadd(float timestep)
1453 {
1454 int[] iprimspaceArrItem = _parent_scene.calculateSpaceArrayItemFromPos(_position);
1455 IntPtr targetspace = _parent_scene.calculateSpaceForGeom(_position);
1456
1457 if (targetspace == IntPtr.Zero)
1458 targetspace = _parent_scene.createprimspace(iprimspaceArrItem[0], iprimspaceArrItem[1]);
1459
1460 m_targetSpace = targetspace;
1461
1462 if (_mesh == null)
1463 {
1464 if (_parent_scene.needsMeshing(_pbs))
1465 {
1466 // Don't need to re-enable body.. it's done in SetMesh
1467 _mesh = _parent_scene.mesher.CreateMesh(m_primName, _pbs, _size, _parent_scene.meshSculptLOD, IsPhysical);
1468 // createmesh returns null when it's a shape that isn't a cube.
1469 // m_log.Debug(m_localID);
1470 }
1471 }
1472
1473
1474 lock (_parent_scene.OdeLock)
1475 {
1476//Console.WriteLine("changeadd 1");
1477 CreateGeom(m_targetSpace, _mesh);
1478
1479 if (prim_geom != IntPtr.Zero)
1480 {
1481 d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z);
1482 d.Quaternion myrot = new d.Quaternion();
1483 myrot.X = _orientation.X;
1484 myrot.Y = _orientation.Y;
1485 myrot.Z = _orientation.Z;
1486 myrot.W = _orientation.W;
1487 d.GeomSetQuaternion(prim_geom, ref myrot);
1488 }
1489
1490 if (m_isphysical && Body == IntPtr.Zero)
1491 {
1492 enableBody();
1493 }
1494 }
1495
1496 _parent_scene.geom_name_map[prim_geom] = this.m_primName;
1497 _parent_scene.actor_name_map[prim_geom] = (PhysicsActor)this;
1498
1499 changeSelectedStatus(timestep);
1500
1501 m_taintadd = false;
1502 }
1503
1504 public void changemove(float timestep)
1505 {
1506 if (m_isphysical)
1507 {
1508
1509 if (!m_disabled && !m_taintremove && !childPrim)
1510 {
1511 if (Body == IntPtr.Zero)
1512 enableBody();
1513 //Prim auto disable after 20 frames,
1514 //if you move it, re-enable the prim manually.
1515 if (_parent != null)
1516 {
1517 if (m_linkJoint != IntPtr.Zero)
1518 {
1519 d.JointDestroy(m_linkJoint);
1520 m_linkJoint = IntPtr.Zero;
1521 }
1522 }
1523 if (Body != IntPtr.Zero)
1524 {
1525 d.BodySetPosition(Body, _position.X, _position.Y, _position.Z);
1526
1527 if (_parent != null)
1528 {
1529 OdePrim odParent = (OdePrim)_parent;
1530 if (Body != (IntPtr)0 && odParent.Body != (IntPtr)0 && Body != odParent.Body)
1531 {
1532// KF: Fixed Joints were removed? Anyway - this Console.WriteLine does not show up, so routine is not used??
1533Console.WriteLine(" JointCreateFixed");
1534 m_linkJoint = d.JointCreateFixed(_parent_scene.world, _linkJointGroup);
1535 d.JointAttach(m_linkJoint, Body, odParent.Body);
1536 d.JointSetFixed(m_linkJoint);
1537 }
1538 }
1539 d.BodyEnable(Body);
1540 if (m_vehicle.Type != Vehicle.TYPE_NONE)
1541 {
1542 m_vehicle.Enable(Body, _parent_scene);
1543 }
1544 }
1545 else
1546 {
1547 m_log.Warn("[PHYSICS]: Body Still null after enableBody(). This is a crash scenario.");
1548 }
1549 }
1550 //else
1551 // {
1552 //m_log.Debug("[BUG]: race!");
1553 //}
1554 }
1555 else
1556 {
1557 // string primScenAvatarIn = _parent_scene.whichspaceamIin(_position);
1558 // int[] arrayitem = _parent_scene.calculateSpaceArrayItemFromPos(_position);
1559 _parent_scene.waitForSpaceUnlock(m_targetSpace);
1560
1561 IntPtr tempspace = _parent_scene.recalculateSpaceForGeom(prim_geom, _position, m_targetSpace);
1562 m_targetSpace = tempspace;
1563
1564 _parent_scene.waitForSpaceUnlock(m_targetSpace);
1565 if (prim_geom != IntPtr.Zero)
1566 {
1567 d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z);
1568
1569 _parent_scene.waitForSpaceUnlock(m_targetSpace);
1570 d.SpaceAdd(m_targetSpace, prim_geom);
1571 }
1572 }
1573
1574 changeSelectedStatus(timestep);
1575
1576 resetCollisionAccounting();
1577 m_taintposition = _position;
1578 }
1579
1580 public void Move(float timestep)
1581 {
1582 float fx = 0;
1583 float fy = 0;
1584 float fz = 0;
1585
1586 frcount++; // used to limit debug comment output
1587 if (frcount > 100)
1588 frcount = 0;
1589
1590 if (IsPhysical && (Body != IntPtr.Zero) && !m_isSelected && !childPrim) // KF: Only move root prims.
1591 {
1592//if(frcount == 0) Console.WriteLine("Move " + m_primName + " VTyp " + m_vehicle.Type +
1593 // " usePID=" + m_usePID + " seHover=" + m_useHoverPID + " useAPID=" + m_useAPID);
1594 if (m_vehicle.Type != Vehicle.TYPE_NONE)
1595 {
1596 // 'VEHICLES' are dealt with in ODEDynamics.cs
1597 m_vehicle.Step(timestep, _parent_scene);
1598 }
1599 else
1600 {
1601 if(!d.BodyIsEnabled (Body)) d.BodyEnable (Body); // KF add 161009
1602 // NON-'VEHICLES' are dealt with here
1603 if (d.BodyIsEnabled(Body) && !m_angularlock.ApproxEquals(Vector3.Zero, 0.003f))
1604 {
1605 d.Vector3 avel2 = d.BodyGetAngularVel(Body);
1606 if (m_angularlock.X == 1)
1607 avel2.X = 0;
1608 if (m_angularlock.Y == 1)
1609 avel2.Y = 0;
1610 if (m_angularlock.Z == 1)
1611 avel2.Z = 0;
1612 d.BodySetAngularVel(Body, avel2.X, avel2.Y, avel2.Z);
1613 }
1614 //float PID_P = 900.0f;
1615
1616 float m_mass = CalculateMass();
1617
1618// fz = 0f;
1619 //m_log.Info(m_collisionFlags.ToString());
1620
1621
1622 //KF: m_buoyancy is set by llSetBuoyancy() and is for non-vehicle.
1623 // m_buoyancy: (unlimited value) <0=Falls fast; 0=1g; 1=0g; >1 = floats up
1624 // NB Prims in ODE are no subject to global gravity
1625 fz = _parent_scene.gravityz * (1.0f - m_buoyancy) * m_mass; // force = acceleration * mass
1626
1627 if (m_usePID)
1628 {
1629//if(frcount == 0) Console.WriteLine("PID " + m_primName);
1630 // KF - this is for object MoveToTarget.
1631
1632 //if (!d.BodyIsEnabled(Body))
1633 //d.BodySetForce(Body, 0f, 0f, 0f);
1634
1635 // no lock; for now it's only called from within Simulate()
1636
1637 // If the PID Controller isn't active then we set our force
1638 // calculating base velocity to the current position
1639
1640 if ((m_PIDTau < 1) && (m_PIDTau != 0))
1641 {
1642 //PID_G = PID_G / m_PIDTau;
1643 m_PIDTau = 1;
1644 }
1645
1646 if ((PID_G - m_PIDTau) <= 0)
1647 {
1648 PID_G = m_PIDTau + 1;
1649 }
1650 //PidStatus = true;
1651
1652 // PhysicsVector vec = new PhysicsVector();
1653 d.Vector3 vel = d.BodyGetLinearVel(Body);
1654
1655 d.Vector3 pos = d.BodyGetPosition(Body);
1656 _target_velocity =
1657 new Vector3(
1658 (m_PIDTarget.X - pos.X) * ((PID_G - m_PIDTau) * timestep),
1659 (m_PIDTarget.Y - pos.Y) * ((PID_G - m_PIDTau) * timestep),
1660 (m_PIDTarget.Z - pos.Z) * ((PID_G - m_PIDTau) * timestep)
1661 );
1662
1663 // if velocity is zero, use position control; otherwise, velocity control
1664
1665 if (_target_velocity.ApproxEquals(Vector3.Zero,0.1f))
1666 {
1667 // keep track of where we stopped. No more slippin' & slidin'
1668
1669 // We only want to deactivate the PID Controller if we think we want to have our surrogate
1670 // react to the physics scene by moving it's position.
1671 // Avatar to Avatar collisions
1672 // Prim to avatar collisions
1673
1674 //fx = (_target_velocity.X - vel.X) * (PID_D) + (_zeroPosition.X - pos.X) * (PID_P * 2);
1675 //fy = (_target_velocity.Y - vel.Y) * (PID_D) + (_zeroPosition.Y - pos.Y) * (PID_P * 2);
1676 //fz = fz + (_target_velocity.Z - vel.Z) * (PID_D) + (_zeroPosition.Z - pos.Z) * PID_P;
1677 d.BodySetPosition(Body, m_PIDTarget.X, m_PIDTarget.Y, m_PIDTarget.Z);
1678 d.BodySetLinearVel(Body, 0, 0, 0);
1679 d.BodyAddForce(Body, 0, 0, fz);
1680 return;
1681 }
1682 else
1683 {
1684 _zeroFlag = false;
1685
1686 // We're flying and colliding with something
1687 fx = ((_target_velocity.X) - vel.X) * (PID_D);
1688 fy = ((_target_velocity.Y) - vel.Y) * (PID_D);
1689
1690 // vec.Z = (_target_velocity.Z - vel.Z) * PID_D + (_zeroPosition.Z - pos.Z) * PID_P;
1691
1692 fz = fz + ((_target_velocity.Z - vel.Z) * (PID_D) * m_mass);
1693 }
1694 } // end if (m_usePID)
1695
1696 // Hover PID Controller needs to be mutually exlusive to MoveTo PID controller
1697 if (m_useHoverPID && !m_usePID)
1698 {
1699//Console.WriteLine("Hover " + m_primName);
1700
1701 // If we're using the PID controller, then we have no gravity
1702 fz = (-1 * _parent_scene.gravityz) * m_mass;
1703
1704 // no lock; for now it's only called from within Simulate()
1705
1706 // If the PID Controller isn't active then we set our force
1707 // calculating base velocity to the current position
1708
1709 if ((m_PIDTau < 1))
1710 {
1711 PID_G = PID_G / m_PIDTau;
1712 }
1713
1714 if ((PID_G - m_PIDTau) <= 0)
1715 {
1716 PID_G = m_PIDTau + 1;
1717 }
1718
1719
1720 // Where are we, and where are we headed?
1721 d.Vector3 pos = d.BodyGetPosition(Body);
1722 d.Vector3 vel = d.BodyGetLinearVel(Body);
1723
1724
1725 // Non-Vehicles have a limited set of Hover options.
1726 // determine what our target height really is based on HoverType
1727 switch (m_PIDHoverType)
1728 {
1729 case PIDHoverType.Ground:
1730 m_groundHeight = _parent_scene.GetTerrainHeightAtXY(pos.X, pos.Y);
1731 m_targetHoverHeight = m_groundHeight + m_PIDHoverHeight;
1732 break;
1733 case PIDHoverType.GroundAndWater:
1734 m_groundHeight = _parent_scene.GetTerrainHeightAtXY(pos.X, pos.Y);
1735 m_waterHeight = _parent_scene.GetWaterLevel();
1736 if (m_groundHeight > m_waterHeight)
1737 {
1738 m_targetHoverHeight = m_groundHeight + m_PIDHoverHeight;
1739 }
1740 else
1741 {
1742 m_targetHoverHeight = m_waterHeight + m_PIDHoverHeight;
1743 }
1744 break;
1745
1746 } // end switch (m_PIDHoverType)
1747
1748
1749 _target_velocity =
1750 new Vector3(0.0f, 0.0f,
1751 (m_targetHoverHeight - pos.Z) * ((PID_G - m_PIDHoverTau) * timestep)
1752 );
1753
1754 // if velocity is zero, use position control; otherwise, velocity control
1755
1756 if (_target_velocity.ApproxEquals(Vector3.Zero, 0.1f))
1757 {
1758 // keep track of where we stopped. No more slippin' & slidin'
1759
1760 // We only want to deactivate the PID Controller if we think we want to have our surrogate
1761 // react to the physics scene by moving it's position.
1762 // Avatar to Avatar collisions
1763 // Prim to avatar collisions
1764
1765 d.BodySetPosition(Body, pos.X, pos.Y, m_targetHoverHeight);
1766 d.BodySetLinearVel(Body, vel.X, vel.Y, 0);
1767 d.BodyAddForce(Body, 0, 0, fz);
1768 //KF this prevents furthur motions return;
1769 }
1770 else
1771 {
1772 _zeroFlag = false;
1773
1774 // We're flying and colliding with something
1775 fz = fz + ((_target_velocity.Z - vel.Z) * (PID_D) * m_mass);
1776 }
1777 } // end m_useHoverPID && !m_usePID
1778
1779 if (m_useAPID)
1780 {
1781 // RotLookAt, apparently overrides all other rotation sources. Inputs:
1782 // Quaternion m_APIDTarget
1783 // float m_APIDStrength // From SL experiments, this is the time to get there
1784 // float m_APIDDamping // From SL experiments, this is damping, 1.0 = damped, 0.1 = wobbly
1785 // Also in SL the mass of the object has no effect on time to get there.
1786 // Factors:
1787//if(frcount == 0) Console.WriteLine("APID ");
1788 // get present body rotation
1789 float limit = 1.0f;
1790 float scaler = 50f; // adjusts damping time
1791 float RLAservo = 0f;
1792
1793 d.Quaternion rot = d.BodyGetQuaternion(Body);
1794 Quaternion rotq = new Quaternion(rot.X, rot.Y, rot.Z, rot.W);
1795 Quaternion rot_diff = Quaternion.Inverse(rotq) * m_APIDTarget;
1796 float diff_angle;
1797 Vector3 diff_axis;
1798 rot_diff.GetAxisAngle(out diff_axis, out diff_angle);
1799 diff_axis.Normalize();
1800 if(diff_angle > 0.01f) // diff_angle is always +ve
1801 {
1802// PhysicsVector rotforce = new PhysicsVector(diff_axis.X, diff_axis.Y, diff_axis.Z);
1803 Vector3 rotforce = new Vector3(diff_axis.X, diff_axis.Y, diff_axis.Z);
1804 rotforce = rotforce * rotq;
1805 if(diff_angle > limit) diff_angle = limit; // cap the rotate rate
1806// RLAservo = timestep / m_APIDStrength * m_mass * scaler;
1807 // rotforce = rotforce * RLAservo * diff_angle ;
1808 // d.BodyAddRelTorque(Body, rotforce.X, rotforce.Y, rotforce.Z);
1809 RLAservo = timestep / m_APIDStrength * scaler;
1810 rotforce = rotforce * RLAservo * diff_angle ;
1811 d.BodySetAngularVel (Body, rotforce.X, rotforce.Y, rotforce.Z);
1812//Console.WriteLine("axis= " + diff_axis + " angle= " + diff_angle + "servo= " + RLAservo);
1813 }
1814//if(frcount == 0) Console.WriteLine("mass= " + m_mass + " servo= " + RLAservo + " angle= " + diff_angle);
1815 } // end m_useAPID
1816
1817 fx *= m_mass;
1818 fy *= m_mass;
1819 //fz *= m_mass;
1820
1821 fx += m_force.X;
1822 fy += m_force.Y;
1823 fz += m_force.Z;
1824
1825 //m_log.Info("[OBJPID]: X:" + fx.ToString() + " Y:" + fy.ToString() + " Z:" + fz.ToString());
1826 if (fx != 0 || fy != 0 || fz != 0)
1827 {
1828 //m_taintdisable = true;
1829 //base.RaiseOutOfBounds(Position);
1830 //d.BodySetLinearVel(Body, fx, fy, 0f);
1831 if (!d.BodyIsEnabled(Body))
1832 {
1833 // A physical body at rest on a surface will auto-disable after a while,
1834 // this appears to re-enable it incase the surface it is upon vanishes,
1835 // and the body should fall again.
1836 d.BodySetLinearVel(Body, 0f, 0f, 0f);
1837 d.BodySetForce(Body, 0, 0, 0);
1838 enableBodySoft();
1839 }
1840
1841 // 35x10 = 350n times the mass per second applied maximum.
1842 float nmax = 35f * m_mass;
1843 float nmin = -35f * m_mass;
1844
1845
1846 if (fx > nmax)
1847 fx = nmax;
1848 if (fx < nmin)
1849 fx = nmin;
1850 if (fy > nmax)
1851 fy = nmax;
1852 if (fy < nmin)
1853 fy = nmin;
1854 d.BodyAddForce(Body, fx, fy, fz);
1855//Console.WriteLine("AddForce " + fx + "," + fy + "," + fz);
1856 }
1857 }
1858 }
1859 else
1860 { // is not physical, or is not a body or is selected
1861 // _zeroPosition = d.BodyGetPosition(Body);
1862 return;
1863//Console.WriteLine("Nothing " + m_primName);
1864
1865 }
1866 }
1867
1868
1869
1870 public void rotate(float timestep)
1871 {
1872 d.Quaternion myrot = new d.Quaternion();
1873 myrot.X = _orientation.X;
1874 myrot.Y = _orientation.Y;
1875 myrot.Z = _orientation.Z;
1876 myrot.W = _orientation.W;
1877 if (Body != IntPtr.Zero)
1878 {
1879 // KF: If this is a root prim do BodySet
1880 d.BodySetQuaternion(Body, ref myrot);
1881 if (m_isphysical)
1882 {
1883 if (!m_angularlock.ApproxEquals(Vector3.One, 0f))
1884 createAMotor(m_angularlock);
1885 }
1886 }
1887 else
1888 {
1889 // daughter prim, do Geom set
1890 d.GeomSetQuaternion(prim_geom, ref myrot);
1891 }
1892
1893 resetCollisionAccounting();
1894 m_taintrot = _orientation;
1895 }
1896
1897 private void resetCollisionAccounting()
1898 {
1899 m_collisionscore = 0;
1900 m_interpenetrationcount = 0;
1901 m_disabled = false;
1902 }
1903
1904 public void changedisable(float timestep)
1905 {
1906 m_disabled = true;
1907 if (Body != IntPtr.Zero)
1908 {
1909 d.BodyDisable(Body);
1910 Body = IntPtr.Zero;
1911 }
1912
1913 m_taintdisable = false;
1914 }
1915
1916 public void changePhysicsStatus(float timestep)
1917 {
1918 if (m_isphysical == true)
1919 {
1920 if (Body == IntPtr.Zero)
1921 {
1922 if (_pbs.SculptEntry && _parent_scene.meshSculptedPrim)
1923 {
1924 changeshape(2f);
1925 }
1926 else
1927 {
1928 enableBody();
1929 }
1930 }
1931 }
1932 else
1933 {
1934 if (Body != IntPtr.Zero)
1935 {
1936 if (_pbs.SculptEntry && _parent_scene.meshSculptedPrim)
1937 {
1938
1939
1940 if (prim_geom != IntPtr.Zero)
1941 {
1942 try
1943 {
1944 d.GeomDestroy(prim_geom);
1945 prim_geom = IntPtr.Zero;
1946 _mesh = null;
1947 }
1948 catch (System.AccessViolationException)
1949 {
1950 prim_geom = IntPtr.Zero;
1951 m_log.Error("[PHYSICS]: PrimGeom dead");
1952 }
1953 }
1954//Console.WriteLine("changePhysicsStatus for " + m_primName );
1955 changeadd(2f);
1956 }
1957 if (childPrim)
1958 {
1959 if (_parent != null)
1960 {
1961 OdePrim parent = (OdePrim)_parent;
1962 parent.ChildDelink(this);
1963 }
1964 }
1965 else
1966 {
1967 disableBody();
1968 }
1969 }
1970 }
1971
1972 changeSelectedStatus(timestep);
1973
1974 resetCollisionAccounting();
1975 m_taintPhysics = m_isphysical;
1976 }
1977
1978 public void changesize(float timestamp)
1979 {
1980
1981 string oldname = _parent_scene.geom_name_map[prim_geom];
1982
1983 if (_size.X <= 0) _size.X = 0.01f;
1984 if (_size.Y <= 0) _size.Y = 0.01f;
1985 if (_size.Z <= 0) _size.Z = 0.01f;
1986
1987 // Cleanup of old prim geometry
1988 if (_mesh != null)
1989 {
1990 // Cleanup meshing here
1991 }
1992 //kill body to rebuild
1993 if (IsPhysical && Body != IntPtr.Zero)
1994 {
1995 if (childPrim)
1996 {
1997 if (_parent != null)
1998 {
1999 OdePrim parent = (OdePrim)_parent;
2000 parent.ChildDelink(this);
2001 }
2002 }
2003 else
2004 {
2005 disableBody();
2006 }
2007 }
2008 if (d.SpaceQuery(m_targetSpace, prim_geom))
2009 {
2010 _parent_scene.waitForSpaceUnlock(m_targetSpace);
2011 d.SpaceRemove(m_targetSpace, prim_geom);
2012 }
2013 d.GeomDestroy(prim_geom);
2014 prim_geom = IntPtr.Zero;
2015 // we don't need to do space calculation because the client sends a position update also.
2016
2017 // Construction of new prim
2018 if (_parent_scene.needsMeshing(_pbs))
2019 {
2020 float meshlod = _parent_scene.meshSculptLOD;
2021
2022 if (IsPhysical)
2023 meshlod = _parent_scene.MeshSculptphysicalLOD;
2024 // Don't need to re-enable body.. it's done in SetMesh
2025
2026 IMesh mesh = null;
2027
2028 if (_parent_scene.needsMeshing(_pbs))
2029 mesh = _parent_scene.mesher.CreateMesh(oldname, _pbs, _size, meshlod, IsPhysical);
2030
2031 //IMesh mesh = _parent_scene.mesher.CreateMesh(oldname, _pbs, _size, meshlod, IsPhysical);
2032//Console.WriteLine("changesize 1");
2033 CreateGeom(m_targetSpace, mesh);
2034
2035
2036 }
2037 else
2038 {
2039 _mesh = null;
2040//Console.WriteLine("changesize 2");
2041 CreateGeom(m_targetSpace, _mesh);
2042 }
2043
2044 d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z);
2045 d.Quaternion myrot = new d.Quaternion();
2046 myrot.X = _orientation.X;
2047 myrot.Y = _orientation.Y;
2048 myrot.Z = _orientation.Z;
2049 myrot.W = _orientation.W;
2050 d.GeomSetQuaternion(prim_geom, ref myrot);
2051
2052 //d.GeomBoxSetLengths(prim_geom, _size.X, _size.Y, _size.Z);
2053 if (IsPhysical && Body == IntPtr.Zero && !childPrim)
2054 {
2055 // Re creates body on size.
2056 // EnableBody also does setMass()
2057 enableBody();
2058 d.BodyEnable(Body);
2059 }
2060
2061 _parent_scene.geom_name_map[prim_geom] = oldname;
2062
2063 changeSelectedStatus(timestamp);
2064 if (childPrim)
2065 {
2066 if (_parent is OdePrim)
2067 {
2068 OdePrim parent = (OdePrim)_parent;
2069 parent.ChildSetGeom(this);
2070 }
2071 }
2072 resetCollisionAccounting();
2073 m_taintsize = _size;
2074 }
2075
2076
2077
2078 public void changefloatonwater(float timestep)
2079 {
2080 m_collidesWater = m_taintCollidesWater;
2081
2082 if (prim_geom != IntPtr.Zero)
2083 {
2084 if (m_collidesWater)
2085 {
2086 m_collisionFlags |= CollisionCategories.Water;
2087 }
2088 else
2089 {
2090 m_collisionFlags &= ~CollisionCategories.Water;
2091 }
2092 d.GeomSetCollideBits(prim_geom, (int)m_collisionFlags);
2093 }
2094 }
2095
2096 public void changeshape(float timestamp)
2097 {
2098 string oldname = _parent_scene.geom_name_map[prim_geom];
2099
2100 // Cleanup of old prim geometry and Bodies
2101 if (IsPhysical && Body != IntPtr.Zero)
2102 {
2103 if (childPrim)
2104 {
2105 if (_parent != null)
2106 {
2107 OdePrim parent = (OdePrim)_parent;
2108 parent.ChildDelink(this);
2109 }
2110 }
2111 else
2112 {
2113 disableBody();
2114 }
2115 }
2116 try
2117 {
2118 d.GeomDestroy(prim_geom);
2119 }
2120 catch (System.AccessViolationException)
2121 {
2122 prim_geom = IntPtr.Zero;
2123 m_log.Error("[PHYSICS]: PrimGeom dead");
2124 }
2125 prim_geom = IntPtr.Zero;
2126 // we don't need to do space calculation because the client sends a position update also.
2127 if (_size.X <= 0) _size.X = 0.01f;
2128 if (_size.Y <= 0) _size.Y = 0.01f;
2129 if (_size.Z <= 0) _size.Z = 0.01f;
2130 // Construction of new prim
2131
2132 if (_parent_scene.needsMeshing(_pbs))
2133 {
2134 // Don't need to re-enable body.. it's done in SetMesh
2135 float meshlod = _parent_scene.meshSculptLOD;
2136
2137 if (IsPhysical)
2138 meshlod = _parent_scene.MeshSculptphysicalLOD;
2139
2140 IMesh mesh = _parent_scene.mesher.CreateMesh(oldname, _pbs, _size, meshlod, IsPhysical);
2141 // createmesh returns null when it doesn't mesh.
2142 CreateGeom(m_targetSpace, mesh);
2143 }
2144 else
2145 {
2146 _mesh = null;
2147//Console.WriteLine("changeshape");
2148 CreateGeom(m_targetSpace, null);
2149 }
2150
2151 d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z);
2152 d.Quaternion myrot = new d.Quaternion();
2153 //myrot.W = _orientation.w;
2154 myrot.W = _orientation.W;
2155 myrot.X = _orientation.X;
2156 myrot.Y = _orientation.Y;
2157 myrot.Z = _orientation.Z;
2158 d.GeomSetQuaternion(prim_geom, ref myrot);
2159
2160 //d.GeomBoxSetLengths(prim_geom, _size.X, _size.Y, _size.Z);
2161 if (IsPhysical && Body == IntPtr.Zero)
2162 {
2163 // Re creates body on size.
2164 // EnableBody also does setMass()
2165 enableBody();
2166 if (Body != IntPtr.Zero)
2167 {
2168 d.BodyEnable(Body);
2169 }
2170 }
2171 _parent_scene.geom_name_map[prim_geom] = oldname;
2172
2173 changeSelectedStatus(timestamp);
2174 if (childPrim)
2175 {
2176 if (_parent is OdePrim)
2177 {
2178 OdePrim parent = (OdePrim)_parent;
2179 parent.ChildSetGeom(this);
2180 }
2181 }
2182 resetCollisionAccounting();
2183 m_taintshape = false;
2184 }
2185
2186 public void changeAddForce(float timestamp)
2187 {
2188 if (!m_isSelected)
2189 {
2190 lock (m_forcelist)
2191 {
2192 //m_log.Info("[PHYSICS]: dequeing forcelist");
2193 if (IsPhysical)
2194 {
2195 Vector3 iforce = Vector3.Zero;
2196 int i = 0;
2197 try
2198 {
2199 for (i = 0; i < m_forcelist.Count; i++)
2200 {
2201
2202 iforce = iforce + (m_forcelist[i] * 100);
2203 }
2204 }
2205 catch (IndexOutOfRangeException)
2206 {
2207 m_forcelist = new List<Vector3>();
2208 m_collisionscore = 0;
2209 m_interpenetrationcount = 0;
2210 m_taintforce = false;
2211 return;
2212 }
2213 catch (ArgumentOutOfRangeException)
2214 {
2215 m_forcelist = new List<Vector3>();
2216 m_collisionscore = 0;
2217 m_interpenetrationcount = 0;
2218 m_taintforce = false;
2219 return;
2220 }
2221 d.BodyEnable(Body);
2222 d.BodyAddForce(Body, iforce.X, iforce.Y, iforce.Z);
2223 }
2224 m_forcelist.Clear();
2225 }
2226
2227 m_collisionscore = 0;
2228 m_interpenetrationcount = 0;
2229 }
2230
2231 m_taintforce = false;
2232
2233 }
2234
2235
2236
2237 public void changeSetTorque(float timestamp)
2238 {
2239 if (!m_isSelected)
2240 {
2241 if (IsPhysical && Body != IntPtr.Zero)
2242 {
2243 d.BodySetTorque(Body, m_taintTorque.X, m_taintTorque.Y, m_taintTorque.Z);
2244 }
2245 }
2246
2247 m_taintTorque = Vector3.Zero;
2248 }
2249
2250 public void changeAddAngularForce(float timestamp)
2251 {
2252 if (!m_isSelected)
2253 {
2254 lock (m_angularforcelist)
2255 {
2256 //m_log.Info("[PHYSICS]: dequeing forcelist");
2257 if (IsPhysical)
2258 {
2259 Vector3 iforce = Vector3.Zero;
2260 for (int i = 0; i < m_angularforcelist.Count; i++)
2261 {
2262 iforce = iforce + (m_angularforcelist[i] * 100);
2263 }
2264 d.BodyEnable(Body);
2265 d.BodyAddTorque(Body, iforce.X, iforce.Y, iforce.Z);
2266
2267 }
2268 m_angularforcelist.Clear();
2269 }
2270
2271 m_collisionscore = 0;
2272 m_interpenetrationcount = 0;
2273 }
2274
2275 m_taintaddangularforce = false;
2276 }
2277
2278 private void changevelocity(float timestep)
2279 {
2280 if (!m_isSelected)
2281 {
2282 Thread.Sleep(20);
2283 if (IsPhysical)
2284 {
2285 if (Body != IntPtr.Zero)
2286 {
2287 d.BodySetLinearVel(Body, m_taintVelocity.X, m_taintVelocity.Y, m_taintVelocity.Z);
2288 }
2289 }
2290
2291 //resetCollisionAccounting();
2292 }
2293 m_taintVelocity = Vector3.Zero;
2294 }
2295
2296 public override bool IsPhysical
2297 {
2298 get { return m_isphysical; }
2299 set
2300 {
2301 m_isphysical = value;
2302 if (!m_isphysical)
2303 { // Zero the remembered last velocity
2304 m_lastVelocity = Vector3.Zero;
2305 if (m_vehicle.Type != Vehicle.TYPE_NONE) m_vehicle.Halt();
2306 }
2307 }
2308 }
2309
2310 public void setPrimForRemoval()
2311 {
2312 m_taintremove = true;
2313 }
2314
2315 public override bool Flying
2316 {
2317 // no flying prims for you
2318 get { return false; }
2319 set { }
2320 }
2321
2322 public override bool IsColliding
2323 {
2324 get { return iscolliding; }
2325 set { iscolliding = value; }
2326 }
2327
2328 public override bool CollidingGround
2329 {
2330 get { return false; }
2331 set { return; }
2332 }
2333
2334 public override bool CollidingObj
2335 {
2336 get { return false; }
2337 set { return; }
2338 }
2339
2340 public override bool ThrottleUpdates
2341 {
2342 get { return m_throttleUpdates; }
2343 set { m_throttleUpdates = value; }
2344 }
2345
2346 public override bool Stopped
2347 {
2348 get { return _zeroFlag; }
2349 }
2350
2351 public override Vector3 Position
2352 {
2353 get { return _position; }
2354
2355 set { _position = value;
2356 //m_log.Info("[PHYSICS]: " + _position.ToString());
2357 }
2358 }
2359
2360 public override Vector3 Size
2361 {
2362 get { return _size; }
2363 set
2364 {
2365 if (value.IsFinite())
2366 {
2367 _size = value;
2368 }
2369 else
2370 {
2371 m_log.Warn("[PHYSICS]: Got NaN Size on object");
2372 }
2373 }
2374 }
2375
2376 public override float Mass
2377 {
2378 get { return CalculateMass(); }
2379 }
2380
2381 public override Vector3 Force
2382 {
2383 //get { return Vector3.Zero; }
2384 get { return m_force; }
2385 set
2386 {
2387 if (value.IsFinite())
2388 {
2389 m_force = value;
2390 }
2391 else
2392 {
2393 m_log.Warn("[PHYSICS]: NaN in Force Applied to an Object");
2394 }
2395 }
2396 }
2397
2398 public override int VehicleType
2399 {
2400 get { return (int)m_vehicle.Type; }
2401 set { m_vehicle.ProcessTypeChange((Vehicle)value); }
2402 }
2403
2404 public override void VehicleFloatParam(int param, float value)
2405 {
2406 m_vehicle.ProcessFloatVehicleParam((Vehicle) param, value);
2407 }
2408
2409 public override void VehicleVectorParam(int param, Vector3 value)
2410 {
2411 m_vehicle.ProcessVectorVehicleParam((Vehicle) param, value);
2412 }
2413
2414 public override void VehicleRotationParam(int param, Quaternion rotation)
2415 {
2416 m_vehicle.ProcessRotationVehicleParam((Vehicle) param, rotation);
2417 }
2418
2419 public override void VehicleFlagsSet(int flags)
2420 {
2421 m_vehicle.ProcessFlagsVehicleSet(flags);
2422 }
2423
2424 public override void VehicleFlagsRemove(int flags)
2425 {
2426 m_vehicle.ProcessFlagsVehicleRemove(flags);
2427 }
2428
2429 public override void VehicleFlags(int flags, bool remove)
2430 {
2431 if (!remove)
2432 m_vehicle.ProcessFlagsVehicleSet(flags);
2433 else
2434 m_vehicle.ProcessFlagsVehicleRemove(flags);
2435 }
2436
2437 public override void SetVolumeDetect(int param)
2438 {
2439 lock (_parent_scene.OdeLock)
2440 {
2441 m_isVolumeDetect = (param!=0);
2442 }
2443 }
2444
2445 public override Vector3 CenterOfMass
2446 {
2447 get { return Vector3.Zero; }
2448 }
2449
2450 public override Vector3 GeometricCenter
2451 {
2452 get { return Vector3.Zero; }
2453 }
2454
2455 public override PrimitiveBaseShape Shape
2456 {
2457 set
2458 {
2459 _pbs = value;
2460 m_taintshape = true;
2461 }
2462 }
2463
2464 public override Vector3 Velocity
2465 {
2466 get
2467 {
2468 // Averate previous velocity with the new one so
2469 // client object interpolation works a 'little' better
2470 if (_zeroFlag)
2471 return Vector3.Zero;
2472
2473 Vector3 returnVelocity = Vector3.Zero;
2474 returnVelocity.X = (m_lastVelocity.X + _velocity.X)/2;
2475 returnVelocity.Y = (m_lastVelocity.Y + _velocity.Y)/2;
2476 returnVelocity.Z = (m_lastVelocity.Z + _velocity.Z)/2;
2477 return returnVelocity;
2478 }
2479 set
2480 {
2481 if (value.IsFinite())
2482 {
2483 _velocity = value;
2484
2485 m_taintVelocity = value;
2486 _parent_scene.AddPhysicsActorTaint(this);
2487 }
2488 else
2489 {
2490 m_log.Warn("[PHYSICS]: Got NaN Velocity in Object");
2491 }
2492
2493 }
2494 }
2495
2496 public override Vector3 Torque
2497 {
2498 get
2499 {
2500 if (!m_isphysical || Body == IntPtr.Zero)
2501 return Vector3.Zero;
2502
2503 return _torque;
2504 }
2505
2506 set
2507 {
2508 if (value.IsFinite())
2509 {
2510 m_taintTorque = value;
2511 _parent_scene.AddPhysicsActorTaint(this);
2512 }
2513 else
2514 {
2515 m_log.Warn("[PHYSICS]: Got NaN Torque in Object");
2516 }
2517 }
2518 }
2519
2520 public override float CollisionScore
2521 {
2522 get { return m_collisionscore; }
2523 set { m_collisionscore = value; }
2524 }
2525
2526 public override bool Kinematic
2527 {
2528 get { return false; }
2529 set { }
2530 }
2531
2532 public override Quaternion Orientation
2533 {
2534 get { return _orientation; }
2535 set
2536 {
2537 if (QuaternionIsFinite(value))
2538 {
2539 _orientation = value;
2540 }
2541 else
2542 m_log.Warn("[PHYSICS]: Got NaN quaternion Orientation from Scene in Object");
2543
2544 }
2545 }
2546
2547 internal static bool QuaternionIsFinite(Quaternion q)
2548 {
2549 if (Single.IsNaN(q.X) || Single.IsInfinity(q.X))
2550 return false;
2551 if (Single.IsNaN(q.Y) || Single.IsInfinity(q.Y))
2552 return false;
2553 if (Single.IsNaN(q.Z) || Single.IsInfinity(q.Z))
2554 return false;
2555 if (Single.IsNaN(q.W) || Single.IsInfinity(q.W))
2556 return false;
2557 return true;
2558 }
2559
2560 public override Vector3 Acceleration
2561 {
2562 get { return _acceleration; }
2563 }
2564
2565
2566 public void SetAcceleration(Vector3 accel)
2567 {
2568 _acceleration = accel;
2569 }
2570
2571 public override void AddForce(Vector3 force, bool pushforce)
2572 {
2573 if (force.IsFinite())
2574 {
2575 lock (m_forcelist)
2576 m_forcelist.Add(force);
2577
2578 m_taintforce = true;
2579 }
2580 else
2581 {
2582 m_log.Warn("[PHYSICS]: Got Invalid linear force vector from Scene in Object");
2583 }
2584 //m_log.Info("[PHYSICS]: Added Force:" + force.ToString() + " to prim at " + Position.ToString());
2585 }
2586
2587 public override void AddAngularForce(Vector3 force, bool pushforce)
2588 {
2589 if (force.IsFinite())
2590 {
2591 m_angularforcelist.Add(force);
2592 m_taintaddangularforce = true;
2593 }
2594 else
2595 {
2596 m_log.Warn("[PHYSICS]: Got Invalid Angular force vector from Scene in Object");
2597 }
2598 }
2599
2600 public override Vector3 RotationalVelocity
2601 {
2602 get
2603 {
2604/* Vector3 pv = Vector3.Zero;
2605 if (_zeroFlag)
2606 return pv;
2607 m_lastUpdateSent = false;
2608
2609 if (m_rotationalVelocity.ApproxEquals(pv, 0.2f))
2610 return pv;
2611*/
2612 return m_rotationalVelocity;
2613 }
2614 set
2615 {
2616 if (value.IsFinite())
2617 {
2618 m_rotationalVelocity = value;
2619 }
2620 else
2621 {
2622 m_log.Warn("[PHYSICS]: Got NaN RotationalVelocity in Object");
2623 }
2624 }
2625 }
2626
2627 public override void CrossingFailure()
2628 {
2629 m_crossingfailures++;
2630 if (m_crossingfailures > _parent_scene.geomCrossingFailuresBeforeOutofbounds)
2631 {
2632 base.RaiseOutOfBounds(_position);
2633 return;
2634 }
2635 else if (m_crossingfailures == _parent_scene.geomCrossingFailuresBeforeOutofbounds)
2636 {
2637 m_log.Warn("[PHYSICS]: Too many crossing failures for: " + m_primName);
2638 }
2639 }
2640
2641 public override float Buoyancy
2642 {
2643 get { return m_buoyancy; }
2644 set { m_buoyancy = value; }
2645 }
2646
2647 public override void link(PhysicsActor obj)
2648 {
2649 m_taintparent = obj;
2650 }
2651
2652 public override void delink()
2653 {
2654 m_taintparent = null;
2655 }
2656
2657 public override void LockAngularMotion(Vector3 axis)
2658 {
2659 // reverse the zero/non zero values for ODE.
2660 if (axis.IsFinite())
2661 {
2662 axis.X = (axis.X > 0) ? 1f : 0f;
2663 axis.Y = (axis.Y > 0) ? 1f : 0f;
2664 axis.Z = (axis.Z > 0) ? 1f : 0f;
2665 m_log.DebugFormat("[axislock]: <{0},{1},{2}>", axis.X, axis.Y, axis.Z);
2666 m_taintAngularLock = axis;
2667 }
2668 else
2669 {
2670 m_log.Warn("[PHYSICS]: Got NaN locking axis from Scene on Object");
2671 }
2672 }
2673
2674 public void UpdatePositionAndVelocity()
2675 {
2676 // no lock; called from Simulate() -- if you call this from elsewhere, gotta lock or do Monitor.Enter/Exit!
2677 if (_parent == null)
2678 {
2679 Vector3 pv = Vector3.Zero;
2680 bool lastZeroFlag = _zeroFlag;
2681 if (Body != (IntPtr)0) // FIXME -> or if it is a joint
2682 {
2683 d.Vector3 vec = d.BodyGetPosition(Body);
2684 d.Quaternion ori = d.BodyGetQuaternion(Body);
2685 d.Vector3 vel = d.BodyGetLinearVel(Body);
2686 d.Vector3 rotvel = d.BodyGetAngularVel(Body);
2687 d.Vector3 torque = d.BodyGetTorque(Body);
2688 _torque = new Vector3(torque.X, torque.Y, torque.Z);
2689 Vector3 l_position = Vector3.Zero;
2690 Quaternion l_orientation = Quaternion.Identity;
2691
2692 // kluge to keep things in bounds. ODE lets dead avatars drift away (they should be removed!)
2693 //if (vec.X < 0.0f) { vec.X = 0.0f; if (Body != (IntPtr)0) d.BodySetAngularVel(Body, 0, 0, 0); }
2694 //if (vec.Y < 0.0f) { vec.Y = 0.0f; if (Body != (IntPtr)0) d.BodySetAngularVel(Body, 0, 0, 0); }
2695 //if (vec.X > 255.95f) { vec.X = 255.95f; if (Body != (IntPtr)0) d.BodySetAngularVel(Body, 0, 0, 0); }
2696 //if (vec.Y > 255.95f) { vec.Y = 255.95f; if (Body != (IntPtr)0) d.BodySetAngularVel(Body, 0, 0, 0); }
2697
2698 m_lastposition = _position;
2699 m_lastorientation = _orientation;
2700
2701 l_position.X = vec.X;
2702 l_position.Y = vec.Y;
2703 l_position.Z = vec.Z;
2704 l_orientation.X = ori.X;
2705 l_orientation.Y = ori.Y;
2706 l_orientation.Z = ori.Z;
2707 l_orientation.W = ori.W;
2708
2709// if(l_position.Y != m_lastposition.Y){
2710// Console.WriteLine("UP&V {0} {1}", m_primName, l_position);
2711// }
2712
2713 if (l_position.X > ((int)_parent_scene.WorldExtents.X - 0.05f) || l_position.X < 0f || l_position.Y > ((int)_parent_scene.WorldExtents.Y - 0.05f) || l_position.Y < 0f)
2714 {
2715 //base.RaiseOutOfBounds(l_position);
2716
2717 if (m_crossingfailures < _parent_scene.geomCrossingFailuresBeforeOutofbounds)
2718 {
2719 _position = l_position;
2720 //_parent_scene.remActivePrim(this);
2721 if (_parent == null)
2722 base.RequestPhysicsterseUpdate();
2723 return;
2724 }
2725 else
2726 {
2727 if (_parent == null)
2728 base.RaiseOutOfBounds(l_position);
2729 return;
2730 }
2731 }
2732
2733 if (l_position.Z < 0)
2734 {
2735 // This is so prim that get lost underground don't fall forever and suck up
2736 //
2737 // Sim resources and memory.
2738 // Disables the prim's movement physics....
2739 // It's a hack and will generate a console message if it fails.
2740
2741 //IsPhysical = false;
2742 if (_parent == null)
2743 base.RaiseOutOfBounds(_position);
2744
2745 _acceleration.X = 0;
2746 _acceleration.Y = 0;
2747 _acceleration.Z = 0;
2748
2749 _velocity.X = 0;
2750 _velocity.Y = 0;
2751 _velocity.Z = 0;
2752 m_rotationalVelocity.X = 0;
2753 m_rotationalVelocity.Y = 0;
2754 m_rotationalVelocity.Z = 0;
2755
2756 if (_parent == null)
2757 base.RequestPhysicsterseUpdate();
2758
2759 m_throttleUpdates = false;
2760 throttleCounter = 0;
2761 _zeroFlag = true;
2762 //outofBounds = true;
2763 }
2764
2765 //float Adiff = 1.0f - Math.Abs(Quaternion.Dot(m_lastorientation, l_orientation));
2766//Console.WriteLine("Adiff " + m_primName + " = " + Adiff);
2767 if ((Math.Abs(m_lastposition.X - l_position.X) < 0.02)
2768 && (Math.Abs(m_lastposition.Y - l_position.Y) < 0.02)
2769 && (Math.Abs(m_lastposition.Z - l_position.Z) < 0.02)
2770// && (1.0 - Math.Abs(Quaternion.Dot(m_lastorientation, l_orientation)) < 0.01))
2771 && (1.0 - Math.Abs(Quaternion.Dot(m_lastorientation, l_orientation)) < 0.0001)) // KF 0.01 is far to large
2772 {
2773 _zeroFlag = true;
2774//Console.WriteLine("ZFT 2");
2775 m_throttleUpdates = false;
2776 }
2777 else
2778 {
2779 //m_log.Debug(Math.Abs(m_lastposition.X - l_position.X).ToString());
2780 _zeroFlag = false;
2781 m_lastUpdateSent = false;
2782 //m_throttleUpdates = false;
2783 }
2784
2785 if (_zeroFlag)
2786 {
2787 _velocity.X = 0.0f;
2788 _velocity.Y = 0.0f;
2789 _velocity.Z = 0.0f;
2790
2791 _acceleration.X = 0;
2792 _acceleration.Y = 0;
2793 _acceleration.Z = 0;
2794
2795 //_orientation.w = 0f;
2796 //_orientation.X = 0f;
2797 //_orientation.Y = 0f;
2798 //_orientation.Z = 0f;
2799 m_rotationalVelocity.X = 0;
2800 m_rotationalVelocity.Y = 0;
2801 m_rotationalVelocity.Z = 0;
2802 if (!m_lastUpdateSent)
2803 {
2804 m_throttleUpdates = false;
2805 throttleCounter = 0;
2806 m_rotationalVelocity = pv;
2807
2808 if (_parent == null)
2809 {
2810 base.RequestPhysicsterseUpdate();
2811 }
2812
2813 m_lastUpdateSent = true;
2814 }
2815 }
2816 else
2817 {
2818 if (lastZeroFlag != _zeroFlag)
2819 {
2820 if (_parent == null)
2821 {
2822 base.RequestPhysicsterseUpdate();
2823 }
2824 }
2825
2826 m_lastVelocity = _velocity;
2827
2828 _position = l_position;
2829
2830 _velocity.X = vel.X;
2831 _velocity.Y = vel.Y;
2832 _velocity.Z = vel.Z;
2833
2834 _acceleration = ((_velocity - m_lastVelocity) / 0.1f);
2835 _acceleration = new Vector3(_velocity.X - m_lastVelocity.X / 0.1f, _velocity.Y - m_lastVelocity.Y / 0.1f, _velocity.Z - m_lastVelocity.Z / 0.1f);
2836 //m_log.Info("[PHYSICS]: V1: " + _velocity + " V2: " + m_lastVelocity + " Acceleration: " + _acceleration.ToString());
2837
2838// if (_velocity.ApproxEquals(pv, 0.5f)) ???? Disregard rotational vel if lin vel is < 0.5 ?????
2839// {
2840// m_rotationalVelocity = pv;/
2841
2842// }
2843// else
2844// {
2845 m_rotationalVelocity = new Vector3(rotvel.X, rotvel.Y, rotvel.Z);
2846// }
2847
2848 //m_log.Debug("ODE: " + m_rotationalVelocity.ToString());
2849 _orientation.X = ori.X;
2850 _orientation.Y = ori.Y;
2851 _orientation.Z = ori.Z;
2852 _orientation.W = ori.W;
2853 m_lastUpdateSent = false;
2854 if (!m_throttleUpdates || throttleCounter > _parent_scene.geomUpdatesPerThrottledUpdate)
2855 {
2856 if (_parent == null)
2857 {
2858 base.RequestPhysicsterseUpdate();
2859 }
2860 }
2861 else
2862 {
2863 throttleCounter++;
2864 }
2865 }
2866 m_lastposition = l_position;
2867 }
2868 else
2869 {
2870 // Not a body.. so Make sure the client isn't interpolating
2871 _velocity.X = 0;
2872 _velocity.Y = 0;
2873 _velocity.Z = 0;
2874
2875 _acceleration.X = 0;
2876 _acceleration.Y = 0;
2877 _acceleration.Z = 0;
2878
2879 m_rotationalVelocity.X = 0;
2880 m_rotationalVelocity.Y = 0;
2881 m_rotationalVelocity.Z = 0;
2882 _zeroFlag = true;
2883 }
2884 }
2885 }
2886
2887 public override bool FloatOnWater
2888 {
2889 set {
2890 m_taintCollidesWater = value;
2891 _parent_scene.AddPhysicsActorTaint(this);
2892 }
2893 }
2894
2895 public override void SetMomentum(Vector3 momentum)
2896 {
2897 }
2898
2899 public override Vector3 PIDTarget
2900 {
2901 set
2902 {
2903 if (value.IsFinite())
2904 {
2905 m_PIDTarget = value;
2906 }
2907 else
2908 m_log.Warn("[PHYSICS]: Got NaN PIDTarget from Scene on Object");
2909 }
2910 }
2911 public override bool PIDActive { set { m_usePID = value; } }
2912 public override float PIDTau { set { m_PIDTau = value; } }
2913
2914 // For RotLookAt
2915 public override Quaternion APIDTarget { set { m_APIDTarget = value; } }
2916 public override bool APIDActive { set { m_useAPID = value; } }
2917 public override float APIDStrength { set { m_APIDStrength = value; } }
2918 public override float APIDDamping { set { m_APIDDamping = value; } }
2919
2920 public override float PIDHoverHeight { set { m_PIDHoverHeight = value; ; } }
2921 public override bool PIDHoverActive { set { m_useHoverPID = value; } }
2922 public override PIDHoverType PIDHoverType { set { m_PIDHoverType = value; } }
2923 public override float PIDHoverTau { set { m_PIDHoverTau = value; } }
2924
2925 private void createAMotor(Vector3 axis)
2926 {
2927 if (Body == IntPtr.Zero)
2928 return;
2929
2930 if (Amotor != IntPtr.Zero)
2931 {
2932 d.JointDestroy(Amotor);
2933 Amotor = IntPtr.Zero;
2934 }
2935
2936 float axisnum = 3;
2937
2938 axisnum = (axisnum - (axis.X + axis.Y + axis.Z));
2939
2940 // PhysicsVector totalSize = new PhysicsVector(_size.X, _size.Y, _size.Z);
2941
2942
2943 // Inverse Inertia Matrix, set the X, Y, and/r Z inertia to 0 then invert it again.
2944 d.Mass objMass;
2945 d.MassSetZero(out objMass);
2946 DMassCopy(ref pMass, ref objMass);
2947
2948 //m_log.DebugFormat("1-{0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}, {8}, ", objMass.I.M00, objMass.I.M01, objMass.I.M02, objMass.I.M10, objMass.I.M11, objMass.I.M12, objMass.I.M20, objMass.I.M21, objMass.I.M22);
2949
2950 Matrix4 dMassMat = FromDMass(objMass);
2951
2952 Matrix4 mathmat = Inverse(dMassMat);
2953
2954 /*
2955 //m_log.DebugFormat("2-{0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}, {8}, ", mathmat[0, 0], mathmat[0, 1], mathmat[0, 2], mathmat[1, 0], mathmat[1, 1], mathmat[1, 2], mathmat[2, 0], mathmat[2, 1], mathmat[2, 2]);
2956
2957 mathmat = Inverse(mathmat);
2958
2959
2960 objMass = FromMatrix4(mathmat, ref objMass);
2961 //m_log.DebugFormat("3-{0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}, {8}, ", objMass.I.M00, objMass.I.M01, objMass.I.M02, objMass.I.M10, objMass.I.M11, objMass.I.M12, objMass.I.M20, objMass.I.M21, objMass.I.M22);
2962
2963 mathmat = Inverse(mathmat);
2964 */
2965 if (axis.X == 0)
2966 {
2967 mathmat.M33 = 50.0000001f;
2968 //objMass.I.M22 = 0;
2969 }
2970 if (axis.Y == 0)
2971 {
2972 mathmat.M22 = 50.0000001f;
2973 //objMass.I.M11 = 0;
2974 }
2975 if (axis.Z == 0)
2976 {
2977 mathmat.M11 = 50.0000001f;
2978 //objMass.I.M00 = 0;
2979 }
2980
2981
2982
2983 mathmat = Inverse(mathmat);
2984 objMass = FromMatrix4(mathmat, ref objMass);
2985 //m_log.DebugFormat("4-{0}, {1}, {2}, {3}, {4}, {5}, {6}, {7}, {8}, ", objMass.I.M00, objMass.I.M01, objMass.I.M02, objMass.I.M10, objMass.I.M11, objMass.I.M12, objMass.I.M20, objMass.I.M21, objMass.I.M22);
2986
2987 //return;
2988 if (d.MassCheck(ref objMass))
2989 {
2990 d.BodySetMass(Body, ref objMass);
2991 }
2992 else
2993 {
2994 //m_log.Debug("[PHYSICS]: Mass invalid, ignoring");
2995 }
2996
2997 if (axisnum <= 0)
2998 return;
2999 // int dAMotorEuler = 1;
3000
3001 Amotor = d.JointCreateAMotor(_parent_scene.world, IntPtr.Zero);
3002 d.JointAttach(Amotor, Body, IntPtr.Zero);
3003 d.JointSetAMotorMode(Amotor, 0);
3004
3005 d.JointSetAMotorNumAxes(Amotor,(int)axisnum);
3006 int i = 0;
3007
3008 if (axis.X == 0)
3009 {
3010 d.JointSetAMotorAxis(Amotor, i, 0, 1, 0, 0);
3011 i++;
3012 }
3013
3014 if (axis.Y == 0)
3015 {
3016 d.JointSetAMotorAxis(Amotor, i, 0, 0, 1, 0);
3017 i++;
3018 }
3019
3020 if (axis.Z == 0)
3021 {
3022 d.JointSetAMotorAxis(Amotor, i, 0, 0, 0, 1);
3023 i++;
3024 }
3025
3026 for (int j = 0; j < (int)axisnum; j++)
3027 {
3028 //d.JointSetAMotorAngle(Amotor, j, 0);
3029 }
3030
3031 //d.JointSetAMotorAngle(Amotor, 1, 0);
3032 //d.JointSetAMotorAngle(Amotor, 2, 0);
3033
3034 // These lowstops and high stops are effectively (no wiggle room)
3035 d.JointSetAMotorParam(Amotor, (int)dParam.LowStop, -0f);
3036 d.JointSetAMotorParam(Amotor, (int)dParam.LoStop3, -0f);
3037 d.JointSetAMotorParam(Amotor, (int)dParam.LoStop2, -0f);
3038 d.JointSetAMotorParam(Amotor, (int)dParam.HiStop, 0f);
3039 d.JointSetAMotorParam(Amotor, (int)dParam.HiStop3, 0f);
3040 d.JointSetAMotorParam(Amotor, (int)dParam.HiStop2, 0f);
3041 //d.JointSetAMotorParam(Amotor, (int) dParam.Vel, 9000f);
3042 d.JointSetAMotorParam(Amotor, (int)dParam.FudgeFactor, 0f);
3043 d.JointSetAMotorParam(Amotor, (int)dParam.FMax, Mass * 50f);//
3044
3045 }
3046
3047 public Matrix4 FromDMass(d.Mass pMass)
3048 {
3049 Matrix4 obj;
3050 obj.M11 = pMass.I.M00;
3051 obj.M12 = pMass.I.M01;
3052 obj.M13 = pMass.I.M02;
3053 obj.M14 = 0;
3054 obj.M21 = pMass.I.M10;
3055 obj.M22 = pMass.I.M11;
3056 obj.M23 = pMass.I.M12;
3057 obj.M24 = 0;
3058 obj.M31 = pMass.I.M20;
3059 obj.M32 = pMass.I.M21;
3060 obj.M33 = pMass.I.M22;
3061 obj.M34 = 0;
3062 obj.M41 = 0;
3063 obj.M42 = 0;
3064 obj.M43 = 0;
3065 obj.M44 = 1;
3066 return obj;
3067 }
3068
3069 public d.Mass FromMatrix4(Matrix4 pMat, ref d.Mass obj)
3070 {
3071 obj.I.M00 = pMat[0, 0];
3072 obj.I.M01 = pMat[0, 1];
3073 obj.I.M02 = pMat[0, 2];
3074 obj.I.M10 = pMat[1, 0];
3075 obj.I.M11 = pMat[1, 1];
3076 obj.I.M12 = pMat[1, 2];
3077 obj.I.M20 = pMat[2, 0];
3078 obj.I.M21 = pMat[2, 1];
3079 obj.I.M22 = pMat[2, 2];
3080 return obj;
3081 }
3082
3083 public override void SubscribeEvents(int ms)
3084 {
3085 m_eventsubscription = ms;
3086 _parent_scene.addCollisionEventReporting(this);
3087 }
3088
3089 public override void UnSubscribeEvents()
3090 {
3091 _parent_scene.remCollisionEventReporting(this);
3092 m_eventsubscription = 0;
3093 }
3094
3095 public void AddCollisionEvent(uint CollidedWith, ContactPoint contact)
3096 {
3097 if (CollisionEventsThisFrame == null)
3098 CollisionEventsThisFrame = new CollisionEventUpdate();
3099 CollisionEventsThisFrame.addCollider(CollidedWith, contact);
3100 }
3101
3102 public void SendCollisions()
3103 {
3104 if (CollisionEventsThisFrame == null)
3105 return;
3106
3107 base.SendCollisionUpdate(CollisionEventsThisFrame);
3108
3109 if (CollisionEventsThisFrame.m_objCollisionList.Count == 0)
3110 CollisionEventsThisFrame = null;
3111 else
3112 CollisionEventsThisFrame = new CollisionEventUpdate();
3113 }
3114
3115 public override bool SubscribedEvents()
3116 {
3117 if (m_eventsubscription > 0)
3118 return true;
3119 return false;
3120 }
3121
3122 public static Matrix4 Inverse(Matrix4 pMat)
3123 {
3124 if (determinant3x3(pMat) == 0)
3125 {
3126 return Matrix4.Identity; // should probably throw an error. singluar matrix inverse not possible
3127 }
3128
3129
3130
3131 return (Adjoint(pMat) / determinant3x3(pMat));
3132 }
3133
3134 public static Matrix4 Adjoint(Matrix4 pMat)
3135 {
3136 Matrix4 adjointMatrix = new Matrix4();
3137 for (int i=0; i<4; i++)
3138 {
3139 for (int j=0; j<4; j++)
3140 {
3141 Matrix4SetValue(ref adjointMatrix, i, j, (float)(Math.Pow(-1, i + j) * (determinant3x3(Minor(pMat, i, j)))));
3142 }
3143 }
3144
3145 adjointMatrix = Transpose(adjointMatrix);
3146 return adjointMatrix;
3147 }
3148
3149 public static Matrix4 Minor(Matrix4 matrix, int iRow, int iCol)
3150 {
3151 Matrix4 minor = new Matrix4();
3152 int m = 0, n = 0;
3153 for (int i = 0; i < 4; i++)
3154 {
3155 if (i == iRow)
3156 continue;
3157 n = 0;
3158 for (int j = 0; j < 4; j++)
3159 {
3160 if (j == iCol)
3161 continue;
3162 Matrix4SetValue(ref minor, m,n, matrix[i, j]);
3163 n++;
3164 }
3165 m++;
3166 }
3167 return minor;
3168 }
3169
3170 public static Matrix4 Transpose(Matrix4 pMat)
3171 {
3172 Matrix4 transposeMatrix = new Matrix4();
3173 for (int i = 0; i < 4; i++)
3174 for (int j = 0; j < 4; j++)
3175 Matrix4SetValue(ref transposeMatrix, i, j, pMat[j, i]);
3176 return transposeMatrix;
3177 }
3178
3179 public static void Matrix4SetValue(ref Matrix4 pMat, int r, int c, float val)
3180 {
3181 switch (r)
3182 {
3183 case 0:
3184 switch (c)
3185 {
3186 case 0:
3187 pMat.M11 = val;
3188 break;
3189 case 1:
3190 pMat.M12 = val;
3191 break;
3192 case 2:
3193 pMat.M13 = val;
3194 break;
3195 case 3:
3196 pMat.M14 = val;
3197 break;
3198 }
3199
3200 break;
3201 case 1:
3202 switch (c)
3203 {
3204 case 0:
3205 pMat.M21 = val;
3206 break;
3207 case 1:
3208 pMat.M22 = val;
3209 break;
3210 case 2:
3211 pMat.M23 = val;
3212 break;
3213 case 3:
3214 pMat.M24 = val;
3215 break;
3216 }
3217
3218 break;
3219 case 2:
3220 switch (c)
3221 {
3222 case 0:
3223 pMat.M31 = val;
3224 break;
3225 case 1:
3226 pMat.M32 = val;
3227 break;
3228 case 2:
3229 pMat.M33 = val;
3230 break;
3231 case 3:
3232 pMat.M34 = val;
3233 break;
3234 }
3235
3236 break;
3237 case 3:
3238 switch (c)
3239 {
3240 case 0:
3241 pMat.M41 = val;
3242 break;
3243 case 1:
3244 pMat.M42 = val;
3245 break;
3246 case 2:
3247 pMat.M43 = val;
3248 break;
3249 case 3:
3250 pMat.M44 = val;
3251 break;
3252 }
3253
3254 break;
3255 }
3256 }
3257 private static float determinant3x3(Matrix4 pMat)
3258 {
3259 float det = 0;
3260 float diag1 = pMat[0, 0]*pMat[1, 1]*pMat[2, 2];
3261 float diag2 = pMat[0, 1]*pMat[2, 1]*pMat[2, 0];
3262 float diag3 = pMat[0, 2]*pMat[1, 0]*pMat[2, 1];
3263 float diag4 = pMat[2, 0]*pMat[1, 1]*pMat[0, 2];
3264 float diag5 = pMat[2, 1]*pMat[1, 2]*pMat[0, 0];
3265 float diag6 = pMat[2, 2]*pMat[1, 0]*pMat[0, 1];
3266
3267 det = diag1 + diag2 + diag3 - (diag4 + diag5 + diag6);
3268 return det;
3269
3270 }
3271
3272 private static void DMassCopy(ref d.Mass src, ref d.Mass dst)
3273 {
3274 dst.c.W = src.c.W;
3275 dst.c.X = src.c.X;
3276 dst.c.Y = src.c.Y;
3277 dst.c.Z = src.c.Z;
3278 dst.mass = src.mass;
3279 dst.I.M00 = src.I.M00;
3280 dst.I.M01 = src.I.M01;
3281 dst.I.M02 = src.I.M02;
3282 dst.I.M10 = src.I.M10;
3283 dst.I.M11 = src.I.M11;
3284 dst.I.M12 = src.I.M12;
3285 dst.I.M20 = src.I.M20;
3286 dst.I.M21 = src.I.M21;
3287 dst.I.M22 = src.I.M22;
3288 }
3289
3290 public override void SetMaterial(int pMaterial)
3291 {
3292 m_material = pMaterial;
3293 }
3294
3295 }
3296}
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODERayCastRequestManager.cs b/OpenSim/Region/Physics/ChOdePlugin/ODERayCastRequestManager.cs
new file mode 100644
index 0000000..7314107
--- /dev/null
+++ b/OpenSim/Region/Physics/ChOdePlugin/ODERayCastRequestManager.cs
@@ -0,0 +1,375 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Collections.Generic;
30using System.Reflection;
31using System.Runtime.InteropServices;
32using System.Text;
33using OpenMetaverse;
34using OpenSim.Region.Physics.Manager;
35using Ode.NET;
36using log4net;
37
38namespace OpenSim.Region.Physics.OdePlugin
39{
40 /// <summary>
41 /// Processes raycast requests as ODE is in a state to be able to do them.
42 /// This ensures that it's thread safe and there will be no conflicts.
43 /// Requests get returned by a different thread then they were requested by.
44 /// </summary>
45 public class ODERayCastRequestManager
46 {
47 /// <summary>
48 /// Pending Raycast Requests
49 /// </summary>
50 protected List<ODERayCastRequest> m_PendingRequests = new List<ODERayCastRequest>();
51
52 /// <summary>
53 /// Scene that created this object.
54 /// </summary>
55 private OdeScene m_scene;
56
57 /// <summary>
58 /// ODE contact array to be filled by the collision testing
59 /// </summary>
60 d.ContactGeom[] contacts = new d.ContactGeom[5];
61
62 /// <summary>
63 /// ODE near callback delegate
64 /// </summary>
65 private d.NearCallback nearCallback;
66 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
67 private List<ContactResult> m_contactResults = new List<ContactResult>();
68
69
70 public ODERayCastRequestManager(OdeScene pScene)
71 {
72 m_scene = pScene;
73 nearCallback = near;
74
75 }
76
77 /// <summary>
78 /// Queues a raycast
79 /// </summary>
80 /// <param name="position">Origin of Ray</param>
81 /// <param name="direction">Ray normal</param>
82 /// <param name="length">Ray length</param>
83 /// <param name="retMethod">Return method to send the results</param>
84 public void QueueRequest(Vector3 position, Vector3 direction, float length, RaycastCallback retMethod)
85 {
86 lock (m_PendingRequests)
87 {
88 ODERayCastRequest req = new ODERayCastRequest();
89 req.callbackMethod = retMethod;
90 req.length = length;
91 req.Normal = direction;
92 req.Origin = position;
93
94 m_PendingRequests.Add(req);
95 }
96 }
97
98 /// <summary>
99 /// Process all queued raycast requests
100 /// </summary>
101 /// <returns>Time in MS the raycasts took to process.</returns>
102 public int ProcessQueuedRequests()
103 {
104 int time = System.Environment.TickCount;
105 lock (m_PendingRequests)
106 {
107 if (m_PendingRequests.Count > 0)
108 {
109 ODERayCastRequest[] reqs = m_PendingRequests.ToArray();
110 for (int i = 0; i < reqs.Length; i++)
111 {
112 if (reqs[i].callbackMethod != null) // quick optimization here, don't raycast
113 RayCast(reqs[i]); // if there isn't anyone to send results
114 }
115 /*
116 foreach (ODERayCastRequest req in m_PendingRequests)
117 {
118 if (req.callbackMethod != null) // quick optimization here, don't raycast
119 RayCast(req); // if there isn't anyone to send results to
120
121 }
122 */
123 m_PendingRequests.Clear();
124 }
125 }
126
127 lock (m_contactResults)
128 m_contactResults.Clear();
129
130 return System.Environment.TickCount - time;
131 }
132
133 /// <summary>
134 /// Method that actually initiates the raycast
135 /// </summary>
136 /// <param name="req"></param>
137 private void RayCast(ODERayCastRequest req)
138 {
139 // Create the ray
140 IntPtr ray = d.CreateRay(m_scene.space, req.length);
141 d.GeomRaySet(ray, req.Origin.X, req.Origin.Y, req.Origin.Z, req.Normal.X, req.Normal.Y, req.Normal.Z);
142
143 // Collide test
144 d.SpaceCollide2(m_scene.space, ray, IntPtr.Zero, nearCallback);
145
146 // Remove Ray
147 d.GeomDestroy(ray);
148
149
150 // Define default results
151 bool hitYN = false;
152 uint hitConsumerID = 0;
153 float distance = 999999999999f;
154 Vector3 closestcontact = new Vector3(99999f, 99999f, 99999f);
155 Vector3 snormal = Vector3.Zero;
156
157 // Find closest contact and object.
158 lock (m_contactResults)
159 {
160 foreach (ContactResult cResult in m_contactResults)
161 {
162 if (Vector3.Distance(req.Origin, cResult.Pos) < Vector3.Distance(req.Origin, closestcontact))
163 {
164 closestcontact = cResult.Pos;
165 hitConsumerID = cResult.ConsumerID;
166 distance = cResult.Depth;
167 hitYN = true;
168 snormal = cResult.Normal;
169 }
170 }
171
172 m_contactResults.Clear();
173 }
174
175 // Return results
176 if (req.callbackMethod != null)
177 req.callbackMethod(hitYN, closestcontact, hitConsumerID, distance, snormal);
178 }
179
180 // This is the standard Near. Uses space AABBs to speed up detection.
181 private void near(IntPtr space, IntPtr g1, IntPtr g2)
182 {
183
184 //Don't test against heightfield Geom, or you'll be sorry!
185
186 /*
187 terminate called after throwing an instance of 'std::bad_alloc'
188 what(): std::bad_alloc
189 Stacktrace:
190
191 at (wrapper managed-to-native) Ode.NET.d.Collide (intptr,intptr,int,Ode.NET.d/ContactGeom[],int) <0x00004>
192 at (wrapper managed-to-native) Ode.NET.d.Collide (intptr,intptr,int,Ode.NET.d/ContactGeom[],int) <0xffffffff>
193 at OpenSim.Region.Physics.OdePlugin.ODERayCastRequestManager.near (intptr,intptr,intptr) <0x00280>
194 at (wrapper native-to-managed) OpenSim.Region.Physics.OdePlugin.ODERayCastRequestManager.near (intptr,intptr,intptr) <0xfff
195 fffff>
196 at (wrapper managed-to-native) Ode.NET.d.SpaceCollide2 (intptr,intptr,intptr,Ode.NET.d/NearCallback) <0x00004>
197 at (wrapper managed-to-native) Ode.NET.d.SpaceCollide2 (intptr,intptr,intptr,Ode.NET.d/NearCallback) <0xffffffff>
198 at OpenSim.Region.Physics.OdePlugin.ODERayCastRequestManager.RayCast (OpenSim.Region.Physics.OdePlugin.ODERayCastRequest) <
199 0x00114>
200 at OpenSim.Region.Physics.OdePlugin.ODERayCastRequestManager.ProcessQueuedRequests () <0x000eb>
201 at OpenSim.Region.Physics.OdePlugin.OdeScene.Simulate (single) <0x017e6>
202 at OpenSim.Region.Framework.Scenes.SceneGraph.UpdatePhysics (double) <0x00042>
203 at OpenSim.Region.Framework.Scenes.Scene.Update () <0x0039e>
204 at OpenSim.Region.Framework.Scenes.Scene.Heartbeat (object) <0x00019>
205 at (wrapper runtime-invoke) object.runtime_invoke_void__this___object (object,intptr,intptr,intptr) <0xffffffff>
206
207 Native stacktrace:
208
209 mono [0x80d2a42]
210 [0xb7f5840c]
211 /lib/i686/cmov/libc.so.6(abort+0x188) [0xb7d1a018]
212 /usr/lib/libstdc++.so.6(_ZN9__gnu_cxx27__verbose_terminate_handlerEv+0x158) [0xb45fc988]
213 /usr/lib/libstdc++.so.6 [0xb45fa865]
214 /usr/lib/libstdc++.so.6 [0xb45fa8a2]
215 /usr/lib/libstdc++.so.6 [0xb45fa9da]
216 /usr/lib/libstdc++.so.6(_Znwj+0x83) [0xb45fb033]
217 /usr/lib/libstdc++.so.6(_Znaj+0x1d) [0xb45fb11d]
218 libode.so(_ZN13dxHeightfield23dCollideHeightfieldZoneEiiiiP6dxGeomiiP12dContactGeomi+0xd04) [0xb46678e4]
219 libode.so(_Z19dCollideHeightfieldP6dxGeomS0_iP12dContactGeomi+0x54b) [0xb466832b]
220 libode.so(dCollide+0x102) [0xb46571b2]
221 [0x95cfdec9]
222 [0x8ea07fe1]
223 [0xab260146]
224 libode.so [0xb465a5c4]
225 libode.so(_ZN11dxHashSpace8collide2EPvP6dxGeomPFvS0_S2_S2_E+0x75) [0xb465bcf5]
226 libode.so(dSpaceCollide2+0x177) [0xb465ac67]
227 [0x95cf978e]
228 [0x8ea07945]
229 [0x95cf2bbc]
230 [0xab2787e7]
231 [0xab419fb3]
232 [0xab416657]
233 [0xab415bda]
234 [0xb609b08e]
235 mono(mono_runtime_delegate_invoke+0x34) [0x8192534]
236 mono [0x81a2f0f]
237 mono [0x81d28b6]
238 mono [0x81ea2c6]
239 /lib/i686/cmov/libpthread.so.0 [0xb7e744c0]
240 /lib/i686/cmov/libc.so.6(clone+0x5e) [0xb7dcd6de]
241 */
242
243 // Exclude heightfield geom
244
245 if (g1 == IntPtr.Zero || g2 == IntPtr.Zero)
246 return;
247 if (d.GeomGetClass(g1) == d.GeomClassID.HeightfieldClass || d.GeomGetClass(g2) == d.GeomClassID.HeightfieldClass)
248 return;
249
250 // Raytest against AABBs of spaces first, then dig into the spaces it hits for actual geoms.
251 if (d.GeomIsSpace(g1) || d.GeomIsSpace(g2))
252 {
253 if (g1 == IntPtr.Zero || g2 == IntPtr.Zero)
254 return;
255
256 // Separating static prim geometry spaces.
257 // We'll be calling near recursivly if one
258 // of them is a space to find all of the
259 // contact points in the space
260 try
261 {
262 d.SpaceCollide2(g1, g2, IntPtr.Zero, nearCallback);
263 }
264 catch (AccessViolationException)
265 {
266 m_log.Warn("[PHYSICS]: Unable to collide test a space");
267 return;
268 }
269 //Colliding a space or a geom with a space or a geom. so drill down
270
271 //Collide all geoms in each space..
272 //if (d.GeomIsSpace(g1)) d.SpaceCollide(g1, IntPtr.Zero, nearCallback);
273 //if (d.GeomIsSpace(g2)) d.SpaceCollide(g2, IntPtr.Zero, nearCallback);
274 return;
275 }
276
277 if (g1 == IntPtr.Zero || g2 == IntPtr.Zero)
278 return;
279
280 int count = 0;
281 try
282 {
283
284 if (g1 == g2)
285 return; // Can't collide with yourself
286
287 lock (contacts)
288 {
289 count = d.Collide(g1, g2, contacts.GetLength(0), contacts, d.ContactGeom.SizeOf);
290 }
291 }
292 catch (SEHException)
293 {
294 m_log.Error("[PHYSICS]: The Operating system shut down ODE because of corrupt memory. This could be a result of really irregular terrain. If this repeats continuously, restart using Basic Physics and terrain fill your terrain. Restarting the sim.");
295 }
296 catch (Exception e)
297 {
298 m_log.WarnFormat("[PHYSICS]: Unable to collide test an object: {0}", e.Message);
299 return;
300 }
301
302 PhysicsActor p1 = null;
303 PhysicsActor p2 = null;
304
305 if (g1 != IntPtr.Zero)
306 m_scene.actor_name_map.TryGetValue(g1, out p1);
307
308 if (g2 != IntPtr.Zero)
309 m_scene.actor_name_map.TryGetValue(g1, out p2);
310
311 // Loop over contacts, build results.
312 for (int i = 0; i < count; i++)
313 {
314 if (p1 != null) {
315 if (p1 is OdePrim)
316 {
317 ContactResult collisionresult = new ContactResult();
318
319 collisionresult.ConsumerID = ((OdePrim)p1).m_localID;
320 collisionresult.Pos = new Vector3(contacts[i].pos.X, contacts[i].pos.Y, contacts[i].pos.Z);
321 collisionresult.Depth = contacts[i].depth;
322 collisionresult.Normal = new Vector3(contacts[i].normal.X, contacts[i].normal.Y,
323 contacts[i].normal.Z);
324 lock (m_contactResults)
325 m_contactResults.Add(collisionresult);
326 }
327 }
328
329 if (p2 != null)
330 {
331 if (p2 is OdePrim)
332 {
333 ContactResult collisionresult = new ContactResult();
334
335 collisionresult.ConsumerID = ((OdePrim)p2).m_localID;
336 collisionresult.Pos = new Vector3(contacts[i].pos.X, contacts[i].pos.Y, contacts[i].pos.Z);
337 collisionresult.Depth = contacts[i].depth;
338 collisionresult.Normal = new Vector3(contacts[i].normal.X, contacts[i].normal.Y,
339 contacts[i].normal.Z);
340
341 lock (m_contactResults)
342 m_contactResults.Add(collisionresult);
343 }
344 }
345
346
347 }
348
349 }
350
351 /// <summary>
352 /// Dereference the creator scene so that it can be garbage collected if needed.
353 /// </summary>
354 internal void Dispose()
355 {
356 m_scene = null;
357 }
358 }
359
360 public struct ODERayCastRequest
361 {
362 public Vector3 Origin;
363 public Vector3 Normal;
364 public float length;
365 public RaycastCallback callbackMethod;
366 }
367
368 public struct ContactResult
369 {
370 public Vector3 Pos;
371 public float Depth;
372 public uint ConsumerID;
373 public Vector3 Normal;
374 }
375}
diff --git a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs b/OpenSim/Region/Physics/ChOdePlugin/OdePhysicsJoint.cs
index ca7a4f8..b4a3c48 100644
--- a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs
+++ b/OpenSim/Region/Physics/ChOdePlugin/OdePhysicsJoint.cs
@@ -26,51 +26,23 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using OpenMetaverse;
30using Nini.Config; 30using Ode.NET;
31using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Region.Physics.Manager; 32using OpenSim.Region.Physics.Manager;
33using PhysXWrapper; 33using OpenSim.Region.Physics.OdePlugin;
34using Quaternion=OpenMetaverse.Quaternion;
35using System.Reflection;
36using log4net;
37using OpenMetaverse;
38 34
39namespace OpenSim.Region.Physics.PhysXPlugin 35namespace OpenSim.Region.Physics.OdePlugin
40{ 36{
41 /// <summary> 37 class OdePhysicsJoint : PhysicsJoint
42 /// Will be the PhysX plugin but for now will be a very basic physics engine
43 /// </summary>
44 public class PhysXPlugin : IPhysicsPlugin
45 { 38 {
46 //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 39 public override bool IsInPhysicsEngine
47 private PhysXScene _mScene;
48
49 public PhysXPlugin()
50 {
51 }
52
53 public bool Init()
54 { 40 {
55 return true; 41 get
56 }
57
58 public PhysicsScene GetScene(string sceneIdentifier)
59 {
60 if (_mScene == null)
61 { 42 {
62 _mScene = new PhysXScene(sceneIdentifier); 43 return (jointID != IntPtr.Zero);
63 } 44 }
64 return (_mScene);
65 }
66
67 public string GetName()
68 {
69 return ("RealPhysX");
70 }
71
72 public void Dispose()
73 {
74 } 45 }
46 public IntPtr jointID;
75 } 47 }
76} 48}
diff --git a/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
new file mode 100644
index 0000000..deb6164
--- /dev/null
+++ b/OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
@@ -0,0 +1,3874 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28//#define USE_DRAWSTUFF
29
30using System;
31using System.Collections.Generic;
32using System.Reflection;
33using System.Runtime.InteropServices;
34using System.Threading;
35using System.IO;
36using System.Diagnostics;
37using log4net;
38using Nini.Config;
39using Ode.NET;
40#if USE_DRAWSTUFF
41using Drawstuff.NET;
42#endif
43using OpenSim.Framework;
44using OpenSim.Region.Physics.Manager;
45using OpenMetaverse;
46
47//using OpenSim.Region.Physics.OdePlugin.Meshing;
48
49namespace OpenSim.Region.Physics.OdePlugin
50{
51 /// <summary>
52 /// ODE plugin
53 /// </summary>
54 public class OdePlugin : IPhysicsPlugin
55 {
56 //private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
57
58 private CollisionLocker ode;
59 private OdeScene _mScene;
60
61 public OdePlugin()
62 {
63 ode = new CollisionLocker();
64 }
65
66 public bool Init()
67 {
68 return true;
69 }
70
71 public PhysicsScene GetScene(String sceneIdentifier)
72 {
73 if (_mScene == null)
74 {
75 // Initializing ODE only when a scene is created allows alternative ODE plugins to co-habit (according to
76 // http://opensimulator.org/mantis/view.php?id=2750).
77 d.InitODE();
78
79 _mScene = new OdeScene(ode, sceneIdentifier);
80 }
81 return (_mScene);
82 }
83
84 public string GetName()
85 {
86 return ("ChODE");
87 }
88
89 public void Dispose()
90 {
91 }
92 }
93
94 public enum StatusIndicators : int
95 {
96 Generic = 0,
97 Start = 1,
98 End = 2
99 }
100
101 public struct sCollisionData
102 {
103 public uint ColliderLocalId;
104 public uint CollidedWithLocalId;
105 public int NumberOfCollisions;
106 public int CollisionType;
107 public int StatusIndicator;
108 public int lastframe;
109 }
110
111 [Flags]
112 public enum CollisionCategories : int
113 {
114 Disabled = 0,
115 Geom = 0x00000001,
116 Body = 0x00000002,
117 Space = 0x00000004,
118 Character = 0x00000008,
119 Land = 0x00000010,
120 Water = 0x00000020,
121 Wind = 0x00000040,
122 Sensor = 0x00000080,
123 Selected = 0x00000100
124 }
125
126 /// <summary>
127 /// Material type for a primitive
128 /// </summary>
129 public enum Material : int
130 {
131 /// <summary></summary>
132 Stone = 0,
133 /// <summary></summary>
134 Metal = 1,
135 /// <summary></summary>
136 Glass = 2,
137 /// <summary></summary>
138 Wood = 3,
139 /// <summary></summary>
140 Flesh = 4,
141 /// <summary></summary>
142 Plastic = 5,
143 /// <summary></summary>
144 Rubber = 6
145
146 }
147
148 public sealed class OdeScene : PhysicsScene
149 {
150 private readonly ILog m_log;
151 // private Dictionary<string, sCollisionData> m_storedCollisions = new Dictionary<string, sCollisionData>();
152
153 CollisionLocker ode;
154
155 private Random fluidRandomizer = new Random(Environment.TickCount);
156
157 private const uint m_regionWidth = Constants.RegionSize;
158 private const uint m_regionHeight = Constants.RegionSize;
159
160 private float ODE_STEPSIZE = 0.020f;
161 private float metersInSpace = 29.9f;
162 private float m_timeDilation = 1.0f;
163
164 public float gravityx = 0f;
165 public float gravityy = 0f;
166 public float gravityz = -9.8f;
167
168 private float contactsurfacelayer = 0.001f;
169
170 private int worldHashspaceLow = -4;
171 private int worldHashspaceHigh = 128;
172
173 private int smallHashspaceLow = -4;
174 private int smallHashspaceHigh = 66;
175
176 private float waterlevel = 0f;
177 private int framecount = 0;
178 //private int m_returncollisions = 10;
179
180 private readonly IntPtr contactgroup;
181
182 internal IntPtr LandGeom;
183 internal IntPtr WaterGeom;
184
185 private float nmTerrainContactFriction = 255.0f;
186 private float nmTerrainContactBounce = 0.1f;
187 private float nmTerrainContactERP = 0.1025f;
188
189 private float mTerrainContactFriction = 75f;
190 private float mTerrainContactBounce = 0.1f;
191 private float mTerrainContactERP = 0.05025f;
192
193 private float nmAvatarObjectContactFriction = 250f;
194 private float nmAvatarObjectContactBounce = 0.1f;
195
196 private float mAvatarObjectContactFriction = 75f;
197 private float mAvatarObjectContactBounce = 0.1f;
198
199 private float avPIDD = 3200f;
200 private float avPIDP = 1400f;
201 private float avCapRadius = 0.37f;
202 private float avStandupTensor = 2000000f;
203 private bool avCapsuleTilted = true; // true = old compatibility mode with leaning capsule; false = new corrected mode
204 public bool IsAvCapsuleTilted { get { return avCapsuleTilted; } set { avCapsuleTilted = value; } }
205 private float avDensity = 80f;
206 private float avHeightFudgeFactor = 0.52f;
207 private float avMovementDivisorWalk = 1.3f;
208 private float avMovementDivisorRun = 0.8f;
209 private float minimumGroundFlightOffset = 3f;
210 public float maximumMassObject = 10000.01f;
211
212 public bool meshSculptedPrim = true;
213 public bool forceSimplePrimMeshing = false;
214
215 public float meshSculptLOD = 32;
216 public float MeshSculptphysicalLOD = 16;
217
218 public float geomDefaultDensity = 10.000006836f;
219
220 public int geomContactPointsStartthrottle = 3;
221 public int geomUpdatesPerThrottledUpdate = 15;
222
223 public float bodyPIDD = 35f;
224 public float bodyPIDG = 25;
225
226 public int geomCrossingFailuresBeforeOutofbounds = 5;
227
228 public float bodyMotorJointMaxforceTensor = 2;
229
230 public int bodyFramesAutoDisable = 20;
231
232 private DateTime m_lastframe = DateTime.UtcNow;
233
234 private float[] _watermap;
235 private bool m_filterCollisions = true;
236
237 private d.NearCallback nearCallback;
238 public d.TriCallback triCallback;
239 public d.TriArrayCallback triArrayCallback;
240 private readonly HashSet<OdeCharacter> _characters = new HashSet<OdeCharacter>();
241 private readonly HashSet<OdePrim> _prims = new HashSet<OdePrim>();
242 private readonly HashSet<OdePrim> _activeprims = new HashSet<OdePrim>();
243 private readonly HashSet<OdePrim> _taintedPrimH = new HashSet<OdePrim>();
244 private readonly Object _taintedPrimLock = new Object();
245 private readonly List<OdePrim> _taintedPrimL = new List<OdePrim>();
246 private readonly HashSet<OdeCharacter> _taintedActors = new HashSet<OdeCharacter>();
247 private readonly List<d.ContactGeom> _perloopContact = new List<d.ContactGeom>();
248 private readonly List<PhysicsActor> _collisionEventPrim = new List<PhysicsActor>();
249 private readonly HashSet<OdeCharacter> _badCharacter = new HashSet<OdeCharacter>();
250 public Dictionary<IntPtr, String> geom_name_map = new Dictionary<IntPtr, String>();
251 public Dictionary<IntPtr, PhysicsActor> actor_name_map = new Dictionary<IntPtr, PhysicsActor>();
252 private bool m_NINJA_physics_joints_enabled = false;
253 //private Dictionary<String, IntPtr> jointpart_name_map = new Dictionary<String,IntPtr>();
254 private readonly Dictionary<String, List<PhysicsJoint>> joints_connecting_actor = new Dictionary<String, List<PhysicsJoint>>();
255 private d.ContactGeom[] contacts;
256 private readonly List<PhysicsJoint> requestedJointsToBeCreated = new List<PhysicsJoint>(); // lock only briefly. accessed by external code (to request new joints) and by OdeScene.Simulate() to move those joints into pending/active
257 private readonly List<PhysicsJoint> pendingJoints = new List<PhysicsJoint>(); // can lock for longer. accessed only by OdeScene.
258 private readonly List<PhysicsJoint> activeJoints = new List<PhysicsJoint>(); // can lock for longer. accessed only by OdeScene.
259 private readonly List<string> requestedJointsToBeDeleted = new List<string>(); // lock only briefly. accessed by external code (to request deletion of joints) and by OdeScene.Simulate() to move those joints out of pending/active
260 private Object externalJointRequestsLock = new Object();
261 private readonly Dictionary<String, PhysicsJoint> SOPName_to_activeJoint = new Dictionary<String, PhysicsJoint>();
262 private readonly Dictionary<String, PhysicsJoint> SOPName_to_pendingJoint = new Dictionary<String, PhysicsJoint>();
263 private readonly DoubleDictionary<Vector3, IntPtr, IntPtr> RegionTerrain = new DoubleDictionary<Vector3, IntPtr, IntPtr>();
264 private readonly Dictionary<IntPtr,float[]> TerrainHeightFieldHeights = new Dictionary<IntPtr, float[]>();
265
266 private d.Contact contact;
267 private d.Contact TerrainContact;
268 private d.Contact AvatarMovementprimContact;
269 private d.Contact AvatarMovementTerrainContact;
270 private d.Contact WaterContact;
271 private d.Contact[,] m_materialContacts;
272
273//Ckrinke: Comment out until used. We declare it, initialize it, but do not use it
274//Ckrinke private int m_randomizeWater = 200;
275 private int m_physicsiterations = 10;
276 private const float m_SkipFramesAtms = 0.40f; // Drop frames gracefully at a 400 ms lag
277 private readonly PhysicsActor PANull = new NullPhysicsActor();
278 private float step_time = 0.0f;
279//Ckrinke: Comment out until used. We declare it, initialize it, but do not use it
280//Ckrinke private int ms = 0;
281 public IntPtr world;
282 //private bool returncollisions = false;
283 // private uint obj1LocalID = 0;
284 private uint obj2LocalID = 0;
285 //private int ctype = 0;
286 private OdeCharacter cc1;
287 private OdePrim cp1;
288 private OdeCharacter cc2;
289 private OdePrim cp2;
290 //private int cStartStop = 0;
291 //private string cDictKey = "";
292
293 public IntPtr space;
294
295 //private IntPtr tmpSpace;
296 // split static geometry collision handling into spaces of 30 meters
297 public IntPtr[,] staticPrimspace;
298
299 public Object OdeLock;
300
301 public IMesher mesher;
302
303 private IConfigSource m_config;
304
305 public bool physics_logging = false;
306 public int physics_logging_interval = 0;
307 public bool physics_logging_append_existing_logfile = false;
308
309 public d.Vector3 xyz = new d.Vector3(128.1640f, 128.3079f, 25.7600f);
310 public d.Vector3 hpr = new d.Vector3(125.5000f, -17.0000f, 0.0000f);
311
312 // TODO: unused: private uint heightmapWidth = m_regionWidth + 1;
313 // TODO: unused: private uint heightmapHeight = m_regionHeight + 1;
314 // TODO: unused: private uint heightmapWidthSamples;
315 // TODO: unused: private uint heightmapHeightSamples;
316
317 private volatile int m_global_contactcount = 0;
318
319 private Vector3 m_worldOffset = Vector3.Zero;
320 public Vector2 WorldExtents = new Vector2((int)Constants.RegionSize, (int)Constants.RegionSize);
321 private PhysicsScene m_parentScene = null;
322
323 private ODERayCastRequestManager m_rayCastManager;
324
325 /// <summary>
326 /// Initiailizes the scene
327 /// Sets many properties that ODE requires to be stable
328 /// These settings need to be tweaked 'exactly' right or weird stuff happens.
329 /// </summary>
330 public OdeScene(CollisionLocker dode, string sceneIdentifier)
331 {
332 m_log
333 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType.ToString() + "." + sceneIdentifier);
334
335 OdeLock = new Object();
336 ode = dode;
337 nearCallback = near;
338 triCallback = TriCallback;
339 triArrayCallback = TriArrayCallback;
340 m_rayCastManager = new ODERayCastRequestManager(this);
341 lock (OdeLock)
342 {
343 // Create the world and the first space
344 world = d.WorldCreate();
345 space = d.HashSpaceCreate(IntPtr.Zero);
346
347
348 contactgroup = d.JointGroupCreate(0);
349 //contactgroup
350
351 d.WorldSetAutoDisableFlag(world, false);
352 #if USE_DRAWSTUFF
353
354 Thread viewthread = new Thread(new ParameterizedThreadStart(startvisualization));
355 viewthread.Start();
356 #endif
357 }
358
359
360 _watermap = new float[258 * 258];
361
362 // Zero out the prim spaces array (we split our space into smaller spaces so
363 // we can hit test less.
364 }
365
366#if USE_DRAWSTUFF
367 public void startvisualization(object o)
368 {
369 ds.Functions fn;
370 fn.version = ds.VERSION;
371 fn.start = new ds.CallbackFunction(start);
372 fn.step = new ds.CallbackFunction(step);
373 fn.command = new ds.CallbackFunction(command);
374 fn.stop = null;
375 fn.path_to_textures = "./textures";
376 string[] args = new string[0];
377 ds.SimulationLoop(args.Length, args, 352, 288, ref fn);
378 }
379#endif
380
381 // Initialize the mesh plugin
382 public override void Initialise(IMesher meshmerizer, IConfigSource config)
383 {
384 mesher = meshmerizer;
385 m_config = config;
386 // Defaults
387
388 if (Environment.OSVersion.Platform == PlatformID.Unix)
389 {
390 avPIDD = 3200.0f;
391 avPIDP = 1400.0f;
392 avStandupTensor = 2000000f;
393 }
394 else
395 {
396 avPIDD = 2200.0f;
397 avPIDP = 900.0f;
398 avStandupTensor = 550000f;
399 }
400
401 int contactsPerCollision = 80;
402
403 if (m_config != null)
404 {
405 IConfig physicsconfig = m_config.Configs["ODEPhysicsSettings"];
406 if (physicsconfig != null)
407 {
408 gravityx = physicsconfig.GetFloat("world_gravityx", 0f);
409 gravityy = physicsconfig.GetFloat("world_gravityy", 0f);
410 gravityz = physicsconfig.GetFloat("world_gravityz", -9.8f);
411
412 worldHashspaceLow = physicsconfig.GetInt("world_hashspace_size_low", -4);
413 worldHashspaceHigh = physicsconfig.GetInt("world_hashspace_size_high", 128);
414
415 metersInSpace = physicsconfig.GetFloat("meters_in_small_space", 29.9f);
416 smallHashspaceLow = physicsconfig.GetInt("small_hashspace_size_low", -4);
417 smallHashspaceHigh = physicsconfig.GetInt("small_hashspace_size_high", 66);
418
419 contactsurfacelayer = physicsconfig.GetFloat("world_contact_surface_layer", 0.001f);
420
421 nmTerrainContactFriction = physicsconfig.GetFloat("nm_terraincontact_friction", 255.0f);
422 nmTerrainContactBounce = physicsconfig.GetFloat("nm_terraincontact_bounce", 0.1f);
423 nmTerrainContactERP = physicsconfig.GetFloat("nm_terraincontact_erp", 0.1025f);
424
425 mTerrainContactFriction = physicsconfig.GetFloat("m_terraincontact_friction", 75f);
426 mTerrainContactBounce = physicsconfig.GetFloat("m_terraincontact_bounce", 0.05f);
427 mTerrainContactERP = physicsconfig.GetFloat("m_terraincontact_erp", 0.05025f);
428
429 nmAvatarObjectContactFriction = physicsconfig.GetFloat("objectcontact_friction", 250f);
430 nmAvatarObjectContactBounce = physicsconfig.GetFloat("objectcontact_bounce", 0.2f);
431
432 mAvatarObjectContactFriction = physicsconfig.GetFloat("m_avatarobjectcontact_friction", 75f);
433 mAvatarObjectContactBounce = physicsconfig.GetFloat("m_avatarobjectcontact_bounce", 0.1f);
434
435 ODE_STEPSIZE = physicsconfig.GetFloat("world_stepsize", 0.020f);
436 m_physicsiterations = physicsconfig.GetInt("world_internal_steps_without_collisions", 10);
437
438 avDensity = physicsconfig.GetFloat("av_density", 80f);
439 avHeightFudgeFactor = physicsconfig.GetFloat("av_height_fudge_factor", 0.52f);
440 avMovementDivisorWalk = physicsconfig.GetFloat("av_movement_divisor_walk", 1.3f);
441 avMovementDivisorRun = physicsconfig.GetFloat("av_movement_divisor_run", 0.8f);
442 avCapRadius = physicsconfig.GetFloat("av_capsule_radius", 0.37f);
443 avCapsuleTilted = physicsconfig.GetBoolean("av_capsule_tilted", false);
444
445 contactsPerCollision = physicsconfig.GetInt("contacts_per_collision", 80);
446
447 geomContactPointsStartthrottle = physicsconfig.GetInt("geom_contactpoints_start_throttling", 3);
448 geomUpdatesPerThrottledUpdate = physicsconfig.GetInt("geom_updates_before_throttled_update", 15);
449 geomCrossingFailuresBeforeOutofbounds = physicsconfig.GetInt("geom_crossing_failures_before_outofbounds", 5);
450
451 geomDefaultDensity = physicsconfig.GetFloat("geometry_default_density", 10.000006836f);
452 bodyFramesAutoDisable = physicsconfig.GetInt("body_frames_auto_disable", 20);
453
454 bodyPIDD = physicsconfig.GetFloat("body_pid_derivative", 35f);
455 bodyPIDG = physicsconfig.GetFloat("body_pid_gain", 25f);
456
457 forceSimplePrimMeshing = physicsconfig.GetBoolean("force_simple_prim_meshing", forceSimplePrimMeshing);
458 meshSculptedPrim = physicsconfig.GetBoolean("mesh_sculpted_prim", true);
459 meshSculptLOD = physicsconfig.GetFloat("mesh_lod", 32f);
460 MeshSculptphysicalLOD = physicsconfig.GetFloat("mesh_physical_lod", 16f);
461 m_filterCollisions = physicsconfig.GetBoolean("filter_collisions", false);
462
463 if (Environment.OSVersion.Platform == PlatformID.Unix)
464 {
465 avPIDD = physicsconfig.GetFloat("av_pid_derivative_linux", 2200.0f);
466 avPIDP = physicsconfig.GetFloat("av_pid_proportional_linux", 900.0f);
467 avStandupTensor = physicsconfig.GetFloat("av_capsule_standup_tensor_linux", 550000f);
468 bodyMotorJointMaxforceTensor = physicsconfig.GetFloat("body_motor_joint_maxforce_tensor_linux", 5f);
469 }
470 else
471 {
472 avPIDD = physicsconfig.GetFloat("av_pid_derivative_win", 2200.0f);
473 avPIDP = physicsconfig.GetFloat("av_pid_proportional_win", 900.0f);
474 avStandupTensor = physicsconfig.GetFloat("av_capsule_standup_tensor_win", 550000f);
475 bodyMotorJointMaxforceTensor = physicsconfig.GetFloat("body_motor_joint_maxforce_tensor_win", 5f);
476 }
477
478 physics_logging = physicsconfig.GetBoolean("physics_logging", false);
479 physics_logging_interval = physicsconfig.GetInt("physics_logging_interval", 0);
480 physics_logging_append_existing_logfile = physicsconfig.GetBoolean("physics_logging_append_existing_logfile", false);
481
482 m_NINJA_physics_joints_enabled = physicsconfig.GetBoolean("use_NINJA_physics_joints", false);
483 minimumGroundFlightOffset = physicsconfig.GetFloat("minimum_ground_flight_offset", 3f);
484 maximumMassObject = physicsconfig.GetFloat("maximum_mass_object", 10000.01f);
485 }
486 }
487
488 contacts = new d.ContactGeom[contactsPerCollision];
489
490 staticPrimspace = new IntPtr[(int)(300 / metersInSpace), (int)(300 / metersInSpace)];
491
492 // Centeral contact friction and bounce
493 // ckrinke 11/10/08 Enabling soft_erp but not soft_cfm until I figure out why
494 // an avatar falls through in Z but not in X or Y when walking on a prim.
495 contact.surface.mode |= d.ContactFlags.SoftERP;
496 contact.surface.mu = nmAvatarObjectContactFriction;
497 contact.surface.bounce = nmAvatarObjectContactBounce;
498 contact.surface.soft_cfm = 0.010f;
499 contact.surface.soft_erp = 0.010f;
500
501 // Terrain contact friction and Bounce
502 // This is the *non* moving version. Use this when an avatar
503 // isn't moving to keep it in place better
504 TerrainContact.surface.mode |= d.ContactFlags.SoftERP;
505 TerrainContact.surface.mu = nmTerrainContactFriction;
506 TerrainContact.surface.bounce = nmTerrainContactBounce;
507 TerrainContact.surface.soft_erp = nmTerrainContactERP;
508
509 WaterContact.surface.mode |= (d.ContactFlags.SoftERP | d.ContactFlags.SoftCFM);
510 WaterContact.surface.mu = 0f; // No friction
511 WaterContact.surface.bounce = 0.0f; // No bounce
512 WaterContact.surface.soft_cfm = 0.010f;
513 WaterContact.surface.soft_erp = 0.010f;
514
515 // Prim contact friction and bounce
516 // THis is the *non* moving version of friction and bounce
517 // Use this when an avatar comes in contact with a prim
518 // and is moving
519 AvatarMovementprimContact.surface.mu = mAvatarObjectContactFriction;
520 AvatarMovementprimContact.surface.bounce = mAvatarObjectContactBounce;
521
522 // Terrain contact friction bounce and various error correcting calculations
523 // Use this when an avatar is in contact with the terrain and moving.
524 AvatarMovementTerrainContact.surface.mode |= d.ContactFlags.SoftERP;
525 AvatarMovementTerrainContact.surface.mu = mTerrainContactFriction;
526 AvatarMovementTerrainContact.surface.bounce = mTerrainContactBounce;
527 AvatarMovementTerrainContact.surface.soft_erp = mTerrainContactERP;
528
529
530 /*
531 <summary></summary>
532 Stone = 0,
533 /// <summary></summary>
534 Metal = 1,
535 /// <summary></summary>
536 Glass = 2,
537 /// <summary></summary>
538 Wood = 3,
539 /// <summary></summary>
540 Flesh = 4,
541 /// <summary></summary>
542 Plastic = 5,
543 /// <summary></summary>
544 Rubber = 6
545 */
546
547 m_materialContacts = new d.Contact[7,2];
548
549 m_materialContacts[(int)Material.Stone, 0] = new d.Contact();
550 m_materialContacts[(int)Material.Stone, 0].surface.mode |= d.ContactFlags.SoftERP;
551 m_materialContacts[(int)Material.Stone, 0].surface.mu = nmAvatarObjectContactFriction;
552 m_materialContacts[(int)Material.Stone, 0].surface.bounce = nmAvatarObjectContactBounce;
553 m_materialContacts[(int)Material.Stone, 0].surface.soft_cfm = 0.010f;
554 m_materialContacts[(int)Material.Stone, 0].surface.soft_erp = 0.010f;
555
556 m_materialContacts[(int)Material.Stone, 1] = new d.Contact();
557 m_materialContacts[(int)Material.Stone, 1].surface.mode |= d.ContactFlags.SoftERP;
558 m_materialContacts[(int)Material.Stone, 1].surface.mu = mAvatarObjectContactFriction;
559 m_materialContacts[(int)Material.Stone, 1].surface.bounce = mAvatarObjectContactBounce;
560 m_materialContacts[(int)Material.Stone, 1].surface.soft_cfm = 0.010f;
561 m_materialContacts[(int)Material.Stone, 1].surface.soft_erp = 0.010f;
562
563 m_materialContacts[(int)Material.Metal, 0] = new d.Contact();
564 m_materialContacts[(int)Material.Metal, 0].surface.mode |= d.ContactFlags.SoftERP;
565 m_materialContacts[(int)Material.Metal, 0].surface.mu = nmAvatarObjectContactFriction;
566 m_materialContacts[(int)Material.Metal, 0].surface.bounce = nmAvatarObjectContactBounce;
567 m_materialContacts[(int)Material.Metal, 0].surface.soft_cfm = 0.010f;
568 m_materialContacts[(int)Material.Metal, 0].surface.soft_erp = 0.010f;
569
570 m_materialContacts[(int)Material.Metal, 1] = new d.Contact();
571 m_materialContacts[(int)Material.Metal, 1].surface.mode |= d.ContactFlags.SoftERP;
572 m_materialContacts[(int)Material.Metal, 1].surface.mu = mAvatarObjectContactFriction;
573 m_materialContacts[(int)Material.Metal, 1].surface.bounce = mAvatarObjectContactBounce;
574 m_materialContacts[(int)Material.Metal, 1].surface.soft_cfm = 0.010f;
575 m_materialContacts[(int)Material.Metal, 1].surface.soft_erp = 0.010f;
576
577 m_materialContacts[(int)Material.Glass, 0] = new d.Contact();
578 m_materialContacts[(int)Material.Glass, 0].surface.mode |= d.ContactFlags.SoftERP;
579 m_materialContacts[(int)Material.Glass, 0].surface.mu = 1f;
580 m_materialContacts[(int)Material.Glass, 0].surface.bounce = 0.5f;
581 m_materialContacts[(int)Material.Glass, 0].surface.soft_cfm = 0.010f;
582 m_materialContacts[(int)Material.Glass, 0].surface.soft_erp = 0.010f;
583
584 /*
585 private float nmAvatarObjectContactFriction = 250f;
586 private float nmAvatarObjectContactBounce = 0.1f;
587
588 private float mAvatarObjectContactFriction = 75f;
589 private float mAvatarObjectContactBounce = 0.1f;
590 */
591 m_materialContacts[(int)Material.Glass, 1] = new d.Contact();
592 m_materialContacts[(int)Material.Glass, 1].surface.mode |= d.ContactFlags.SoftERP;
593 m_materialContacts[(int)Material.Glass, 1].surface.mu = 1f;
594 m_materialContacts[(int)Material.Glass, 1].surface.bounce = 0.5f;
595 m_materialContacts[(int)Material.Glass, 1].surface.soft_cfm = 0.010f;
596 m_materialContacts[(int)Material.Glass, 1].surface.soft_erp = 0.010f;
597
598 m_materialContacts[(int)Material.Wood, 0] = new d.Contact();
599 m_materialContacts[(int)Material.Wood, 0].surface.mode |= d.ContactFlags.SoftERP;
600 m_materialContacts[(int)Material.Wood, 0].surface.mu = nmAvatarObjectContactFriction;
601 m_materialContacts[(int)Material.Wood, 0].surface.bounce = nmAvatarObjectContactBounce;
602 m_materialContacts[(int)Material.Wood, 0].surface.soft_cfm = 0.010f;
603 m_materialContacts[(int)Material.Wood, 0].surface.soft_erp = 0.010f;
604
605 m_materialContacts[(int)Material.Wood, 1] = new d.Contact();
606 m_materialContacts[(int)Material.Wood, 1].surface.mode |= d.ContactFlags.SoftERP;
607 m_materialContacts[(int)Material.Wood, 1].surface.mu = mAvatarObjectContactFriction;
608 m_materialContacts[(int)Material.Wood, 1].surface.bounce = mAvatarObjectContactBounce;
609 m_materialContacts[(int)Material.Wood, 1].surface.soft_cfm = 0.010f;
610 m_materialContacts[(int)Material.Wood, 1].surface.soft_erp = 0.010f;
611
612 m_materialContacts[(int)Material.Flesh, 0] = new d.Contact();
613 m_materialContacts[(int)Material.Flesh, 0].surface.mode |= d.ContactFlags.SoftERP;
614 m_materialContacts[(int)Material.Flesh, 0].surface.mu = nmAvatarObjectContactFriction;
615 m_materialContacts[(int)Material.Flesh, 0].surface.bounce = nmAvatarObjectContactBounce;
616 m_materialContacts[(int)Material.Flesh, 0].surface.soft_cfm = 0.010f;
617 m_materialContacts[(int)Material.Flesh, 0].surface.soft_erp = 0.010f;
618
619 m_materialContacts[(int)Material.Flesh, 1] = new d.Contact();
620 m_materialContacts[(int)Material.Flesh, 1].surface.mode |= d.ContactFlags.SoftERP;
621 m_materialContacts[(int)Material.Flesh, 1].surface.mu = mAvatarObjectContactFriction;
622 m_materialContacts[(int)Material.Flesh, 1].surface.bounce = mAvatarObjectContactBounce;
623 m_materialContacts[(int)Material.Flesh, 1].surface.soft_cfm = 0.010f;
624 m_materialContacts[(int)Material.Flesh, 1].surface.soft_erp = 0.010f;
625
626 m_materialContacts[(int)Material.Plastic, 0] = new d.Contact();
627 m_materialContacts[(int)Material.Plastic, 0].surface.mode |= d.ContactFlags.SoftERP;
628 m_materialContacts[(int)Material.Plastic, 0].surface.mu = nmAvatarObjectContactFriction;
629 m_materialContacts[(int)Material.Plastic, 0].surface.bounce = nmAvatarObjectContactBounce;
630 m_materialContacts[(int)Material.Plastic, 0].surface.soft_cfm = 0.010f;
631 m_materialContacts[(int)Material.Plastic, 0].surface.soft_erp = 0.010f;
632
633 m_materialContacts[(int)Material.Plastic, 1] = new d.Contact();
634 m_materialContacts[(int)Material.Plastic, 1].surface.mode |= d.ContactFlags.SoftERP;
635 m_materialContacts[(int)Material.Plastic, 1].surface.mu = mAvatarObjectContactFriction;
636 m_materialContacts[(int)Material.Plastic, 1].surface.bounce = mAvatarObjectContactBounce;
637 m_materialContacts[(int)Material.Plastic, 1].surface.soft_cfm = 0.010f;
638 m_materialContacts[(int)Material.Plastic, 1].surface.soft_erp = 0.010f;
639
640 m_materialContacts[(int)Material.Rubber, 0] = new d.Contact();
641 m_materialContacts[(int)Material.Rubber, 0].surface.mode |= d.ContactFlags.SoftERP;
642 m_materialContacts[(int)Material.Rubber, 0].surface.mu = nmAvatarObjectContactFriction;
643 m_materialContacts[(int)Material.Rubber, 0].surface.bounce = nmAvatarObjectContactBounce;
644 m_materialContacts[(int)Material.Rubber, 0].surface.soft_cfm = 0.010f;
645 m_materialContacts[(int)Material.Rubber, 0].surface.soft_erp = 0.010f;
646
647 m_materialContacts[(int)Material.Rubber, 1] = new d.Contact();
648 m_materialContacts[(int)Material.Rubber, 1].surface.mode |= d.ContactFlags.SoftERP;
649 m_materialContacts[(int)Material.Rubber, 1].surface.mu = mAvatarObjectContactFriction;
650 m_materialContacts[(int)Material.Rubber, 1].surface.bounce = mAvatarObjectContactBounce;
651 m_materialContacts[(int)Material.Rubber, 1].surface.soft_cfm = 0.010f;
652 m_materialContacts[(int)Material.Rubber, 1].surface.soft_erp = 0.010f;
653
654 d.HashSpaceSetLevels(space, worldHashspaceLow, worldHashspaceHigh);
655
656 // Set the gravity,, don't disable things automatically (we set it explicitly on some things)
657
658 d.WorldSetGravity(world, gravityx, gravityy, gravityz);
659 d.WorldSetContactSurfaceLayer(world, contactsurfacelayer);
660
661 d.WorldSetLinearDamping(world, 256f);
662 d.WorldSetAngularDamping(world, 256f);
663 d.WorldSetAngularDampingThreshold(world, 256f);
664 d.WorldSetLinearDampingThreshold(world, 256f);
665 d.WorldSetMaxAngularSpeed(world, 256f);
666
667 // Set how many steps we go without running collision testing
668 // This is in addition to the step size.
669 // Essentially Steps * m_physicsiterations
670 d.WorldSetQuickStepNumIterations(world, m_physicsiterations);
671 //d.WorldSetContactMaxCorrectingVel(world, 1000.0f);
672
673
674
675 for (int i = 0; i < staticPrimspace.GetLength(0); i++)
676 {
677 for (int j = 0; j < staticPrimspace.GetLength(1); j++)
678 {
679 staticPrimspace[i, j] = IntPtr.Zero;
680 }
681 }
682 }
683
684 internal void waitForSpaceUnlock(IntPtr space)
685 {
686 //if (space != IntPtr.Zero)
687 //while (d.SpaceLockQuery(space)) { } // Wait and do nothing
688 }
689
690 /// <summary>
691 /// Debug space message for printing the space that a prim/avatar is in.
692 /// </summary>
693 /// <param name="pos"></param>
694 /// <returns>Returns which split up space the given position is in.</returns>
695 public string whichspaceamIin(Vector3 pos)
696 {
697 return calculateSpaceForGeom(pos).ToString();
698 }
699
700 #region Collision Detection
701
702 /// <summary>
703 /// This is our near callback. A geometry is near a body
704 /// </summary>
705 /// <param name="space">The space that contains the geoms. Remember, spaces are also geoms</param>
706 /// <param name="g1">a geometry or space</param>
707 /// <param name="g2">another geometry or space</param>
708 private void near(IntPtr space, IntPtr g1, IntPtr g2)
709 {
710 // no lock here! It's invoked from within Simulate(), which is thread-locked
711
712 // Test if we're colliding a geom with a space.
713 // If so we have to drill down into the space recursively
714
715 if (d.GeomIsSpace(g1) || d.GeomIsSpace(g2))
716 {
717 if (g1 == IntPtr.Zero || g2 == IntPtr.Zero)
718 return;
719
720 // Separating static prim geometry spaces.
721 // We'll be calling near recursivly if one
722 // of them is a space to find all of the
723 // contact points in the space
724 try
725 {
726 d.SpaceCollide2(g1, g2, IntPtr.Zero, nearCallback);
727 }
728 catch (AccessViolationException)
729 {
730 m_log.Warn("[PHYSICS]: Unable to collide test a space");
731 return;
732 }
733 //Colliding a space or a geom with a space or a geom. so drill down
734
735 //Collide all geoms in each space..
736 //if (d.GeomIsSpace(g1)) d.SpaceCollide(g1, IntPtr.Zero, nearCallback);
737 //if (d.GeomIsSpace(g2)) d.SpaceCollide(g2, IntPtr.Zero, nearCallback);
738 return;
739 }
740
741 if (g1 == IntPtr.Zero || g2 == IntPtr.Zero)
742 return;
743
744 IntPtr b1 = d.GeomGetBody(g1);
745 IntPtr b2 = d.GeomGetBody(g2);
746
747 // d.GeomClassID id = d.GeomGetClass(g1);
748
749 String name1 = null;
750 String name2 = null;
751
752 if (!geom_name_map.TryGetValue(g1, out name1))
753 {
754 name1 = "null";
755 }
756 if (!geom_name_map.TryGetValue(g2, out name2))
757 {
758 name2 = "null";
759 }
760
761 //if (id == d.GeomClassId.TriMeshClass)
762 //{
763 // m_log.InfoFormat("near: A collision was detected between {1} and {2}", 0, name1, name2);
764 //m_log.Debug("near: A collision was detected between {1} and {2}", 0, name1, name2);
765 //}
766
767 // Figure out how many contact points we have
768 int count = 0;
769 try
770 {
771 // Colliding Geom To Geom
772 // This portion of the function 'was' blatantly ripped off from BoxStack.cs
773
774 if (g1 == g2)
775 return; // Can't collide with yourself
776
777 if (b1 != IntPtr.Zero && b2 != IntPtr.Zero && d.AreConnectedExcluding(b1, b2, d.JointType.Contact))
778 return;
779
780 lock (contacts)
781 {
782 count = d.Collide(g1, g2, contacts.Length, contacts, d.ContactGeom.SizeOf);
783 if (count > contacts.Length)
784 m_log.Error("[PHYSICS]: Got " + count + " contacts when we asked for a maximum of " + contacts.Length);
785 }
786 }
787 catch (SEHException)
788 {
789 m_log.Error("[PHYSICS]: The Operating system shut down ODE because of corrupt memory. This could be a result of really irregular terrain. If this repeats continuously, restart using Basic Physics and terrain fill your terrain. Restarting the sim.");
790 ode.drelease(world);
791 base.TriggerPhysicsBasedRestart();
792 }
793 catch (Exception e)
794 {
795 m_log.WarnFormat("[PHYSICS]: Unable to collide test an object: {0}", e.Message);
796 return;
797 }
798
799 PhysicsActor p1;
800 PhysicsActor p2;
801
802 if (!actor_name_map.TryGetValue(g1, out p1))
803 {
804 p1 = PANull;
805 }
806
807 if (!actor_name_map.TryGetValue(g2, out p2))
808 {
809 p2 = PANull;
810 }
811
812 ContactPoint maxDepthContact = new ContactPoint();
813 if (p1.CollisionScore + count >= float.MaxValue)
814 p1.CollisionScore = 0;
815 p1.CollisionScore += count;
816
817 if (p2.CollisionScore + count >= float.MaxValue)
818 p2.CollisionScore = 0;
819 p2.CollisionScore += count;
820
821 for (int i = 0; i < count; i++)
822 {
823 d.ContactGeom curContact = contacts[i];
824
825 if (curContact.depth > maxDepthContact.PenetrationDepth)
826 {
827 maxDepthContact = new ContactPoint(
828 new Vector3(curContact.pos.X, curContact.pos.Y, curContact.pos.Z),
829 new Vector3(curContact.normal.X, curContact.normal.Y, curContact.normal.Z),
830 curContact.depth
831 );
832 }
833
834 //m_log.Warn("[CCOUNT]: " + count);
835 IntPtr joint;
836 // If we're colliding with terrain, use 'TerrainContact' instead of contact.
837 // allows us to have different settings
838
839 // We only need to test p2 for 'jump crouch purposes'
840 if (p2 is OdeCharacter && p1.PhysicsActorType == (int)ActorTypes.Prim)
841 {
842 // Testing if the collision is at the feet of the avatar
843
844 //m_log.DebugFormat("[PHYSICS]: {0} - {1} - {2} - {3}", curContact.pos.Z, p2.Position.Z, (p2.Position.Z - curContact.pos.Z), (p2.Size.Z * 0.6f));
845 if ((p2.Position.Z - curContact.pos.Z) > (p2.Size.Z * 0.6f))
846 p2.IsColliding = true;
847 }
848 else
849 {
850 p2.IsColliding = true;
851 }
852
853 //if ((framecount % m_returncollisions) == 0)
854
855 switch (p1.PhysicsActorType)
856 {
857 case (int)ActorTypes.Agent:
858 p2.CollidingObj = true;
859 break;
860 case (int)ActorTypes.Prim:
861 if (p2.Velocity.LengthSquared() > 0.0f)
862 p2.CollidingObj = true;
863 break;
864 case (int)ActorTypes.Unknown:
865 p2.CollidingGround = true;
866 break;
867 default:
868 p2.CollidingGround = true;
869 break;
870 }
871
872 // we don't want prim or avatar to explode
873
874 #region InterPenetration Handling - Unintended physics explosions
875# region disabled code1
876
877 if (curContact.depth >= 0.08f)
878 {
879 //This is disabled at the moment only because it needs more tweaking
880 //It will eventually be uncommented
881 /*
882 if (contact.depth >= 1.00f)
883 {
884 //m_log.Debug("[PHYSICS]: " + contact.depth.ToString());
885 }
886
887 //If you interpenetrate a prim with an agent
888 if ((p2.PhysicsActorType == (int) ActorTypes.Agent &&
889 p1.PhysicsActorType == (int) ActorTypes.Prim) ||
890 (p1.PhysicsActorType == (int) ActorTypes.Agent &&
891 p2.PhysicsActorType == (int) ActorTypes.Prim))
892 {
893
894 //contact.depth = contact.depth * 4.15f;
895 /*
896 if (p2.PhysicsActorType == (int) ActorTypes.Agent)
897 {
898 p2.CollidingObj = true;
899 contact.depth = 0.003f;
900 p2.Velocity = p2.Velocity + new PhysicsVector(0, 0, 2.5f);
901 OdeCharacter character = (OdeCharacter) p2;
902 character.SetPidStatus(true);
903 contact.pos = new d.Vector3(contact.pos.X + (p1.Size.X / 2), contact.pos.Y + (p1.Size.Y / 2), contact.pos.Z + (p1.Size.Z / 2));
904
905 }
906 else
907 {
908
909 //contact.depth = 0.0000000f;
910 }
911 if (p1.PhysicsActorType == (int) ActorTypes.Agent)
912 {
913
914 p1.CollidingObj = true;
915 contact.depth = 0.003f;
916 p1.Velocity = p1.Velocity + new PhysicsVector(0, 0, 2.5f);
917 contact.pos = new d.Vector3(contact.pos.X + (p2.Size.X / 2), contact.pos.Y + (p2.Size.Y / 2), contact.pos.Z + (p2.Size.Z / 2));
918 OdeCharacter character = (OdeCharacter)p1;
919 character.SetPidStatus(true);
920 }
921 else
922 {
923
924 //contact.depth = 0.0000000f;
925 }
926
927
928
929 }
930*/
931 // If you interpenetrate a prim with another prim
932 /*
933 if (p1.PhysicsActorType == (int) ActorTypes.Prim && p2.PhysicsActorType == (int) ActorTypes.Prim)
934 {
935 #region disabledcode2
936 //OdePrim op1 = (OdePrim)p1;
937 //OdePrim op2 = (OdePrim)p2;
938 //op1.m_collisionscore++;
939 //op2.m_collisionscore++;
940
941 //if (op1.m_collisionscore > 8000 || op2.m_collisionscore > 8000)
942 //{
943 //op1.m_taintdisable = true;
944 //AddPhysicsActorTaint(p1);
945 //op2.m_taintdisable = true;
946 //AddPhysicsActorTaint(p2);
947 //}
948
949 //if (contact.depth >= 0.25f)
950 //{
951 // Don't collide, one or both prim will expld.
952
953 //op1.m_interpenetrationcount++;
954 //op2.m_interpenetrationcount++;
955 //interpenetrations_before_disable = 200;
956 //if (op1.m_interpenetrationcount >= interpenetrations_before_disable)
957 //{
958 //op1.m_taintdisable = true;
959 //AddPhysicsActorTaint(p1);
960 //}
961 //if (op2.m_interpenetrationcount >= interpenetrations_before_disable)
962 //{
963 // op2.m_taintdisable = true;
964 //AddPhysicsActorTaint(p2);
965 //}
966
967 //contact.depth = contact.depth / 8f;
968 //contact.normal = new d.Vector3(0, 0, 1);
969 //}
970 //if (op1.m_disabled || op2.m_disabled)
971 //{
972 //Manually disabled objects stay disabled
973 //contact.depth = 0f;
974 //}
975 #endregion
976 }
977 */
978#endregion
979 if (curContact.depth >= 1.00f)
980 {
981 //m_log.Info("[P]: " + contact.depth.ToString());
982 if ((p2.PhysicsActorType == (int) ActorTypes.Agent &&
983 p1.PhysicsActorType == (int) ActorTypes.Unknown) ||
984 (p1.PhysicsActorType == (int) ActorTypes.Agent &&
985 p2.PhysicsActorType == (int) ActorTypes.Unknown))
986 {
987 if (p2.PhysicsActorType == (int) ActorTypes.Agent)
988 {
989 if (p2 is OdeCharacter)
990 {
991 OdeCharacter character = (OdeCharacter) p2;
992
993 //p2.CollidingObj = true;
994 curContact.depth = 0.00000003f;
995 p2.Velocity = p2.Velocity + new Vector3(0f, 0f, 0.5f);
996 curContact.pos =
997 new d.Vector3(curContact.pos.X + (p1.Size.X/2),
998 curContact.pos.Y + (p1.Size.Y/2),
999 curContact.pos.Z + (p1.Size.Z/2));
1000 character.SetPidStatus(true);
1001 }
1002 }
1003
1004
1005 if (p1.PhysicsActorType == (int) ActorTypes.Agent)
1006 {
1007 if (p1 is OdeCharacter)
1008 {
1009 OdeCharacter character = (OdeCharacter) p1;
1010
1011 //p2.CollidingObj = true;
1012 curContact.depth = 0.00000003f;
1013 p1.Velocity = p1.Velocity + new Vector3(0f, 0f, 0.5f);
1014 curContact.pos =
1015 new d.Vector3(curContact.pos.X + (p1.Size.X/2),
1016 curContact.pos.Y + (p1.Size.Y/2),
1017 curContact.pos.Z + (p1.Size.Z/2));
1018 character.SetPidStatus(true);
1019 }
1020 }
1021 }
1022 }
1023 }
1024
1025 #endregion
1026
1027 // Logic for collision handling
1028 // Note, that if *all* contacts are skipped (VolumeDetect)
1029 // The prim still detects (and forwards) collision events but
1030 // appears to be phantom for the world
1031 Boolean skipThisContact = false;
1032
1033 if ((p1 is OdePrim) && (((OdePrim)p1).m_isVolumeDetect))
1034 skipThisContact = true; // No collision on volume detect prims
1035
1036 if (!skipThisContact && (p2 is OdePrim) && (((OdePrim)p2).m_isVolumeDetect))
1037 skipThisContact = true; // No collision on volume detect prims
1038
1039 if (!skipThisContact && curContact.depth < 0f)
1040 skipThisContact = true;
1041
1042 if (!skipThisContact && checkDupe(curContact, p2.PhysicsActorType))
1043 skipThisContact = true;
1044
1045 const int maxContactsbeforedeath = 4000;
1046 joint = IntPtr.Zero;
1047
1048 if (!skipThisContact)
1049 {
1050 // If we're colliding against terrain
1051 if (name1 == "Terrain" || name2 == "Terrain")
1052 {
1053 // If we're moving
1054 if ((p2.PhysicsActorType == (int) ActorTypes.Agent) &&
1055 (Math.Abs(p2.Velocity.X) > 0.01f || Math.Abs(p2.Velocity.Y) > 0.01f))
1056 {
1057 // Use the movement terrain contact
1058 AvatarMovementTerrainContact.geom = curContact;
1059 _perloopContact.Add(curContact);
1060 if (m_global_contactcount < maxContactsbeforedeath)
1061 {
1062 joint = d.JointCreateContact(world, contactgroup, ref AvatarMovementTerrainContact);
1063 m_global_contactcount++;
1064 }
1065 }
1066 else
1067 {
1068 if (p2.PhysicsActorType == (int)ActorTypes.Agent)
1069 {
1070 // Use the non moving terrain contact
1071 TerrainContact.geom = curContact;
1072 _perloopContact.Add(curContact);
1073 if (m_global_contactcount < maxContactsbeforedeath)
1074 {
1075 joint = d.JointCreateContact(world, contactgroup, ref TerrainContact);
1076 m_global_contactcount++;
1077 }
1078 }
1079 else
1080 {
1081 if (p2.PhysicsActorType == (int)ActorTypes.Prim && p1.PhysicsActorType == (int)ActorTypes.Prim)
1082 {
1083 // prim prim contact
1084 // int pj294950 = 0;
1085 int movintYN = 0;
1086 int material = (int) Material.Wood;
1087 // prim terrain contact
1088 if (Math.Abs(p2.Velocity.X) > 0.01f || Math.Abs(p2.Velocity.Y) > 0.01f)
1089 {
1090 movintYN = 1;
1091 }
1092
1093 if (p2 is OdePrim)
1094 material = ((OdePrim)p2).m_material;
1095
1096 //m_log.DebugFormat("Material: {0}", material);
1097 m_materialContacts[material, movintYN].geom = curContact;
1098 _perloopContact.Add(curContact);
1099
1100 if (m_global_contactcount < maxContactsbeforedeath)
1101 {
1102 joint = d.JointCreateContact(world, contactgroup, ref m_materialContacts[material, movintYN]);
1103 m_global_contactcount++;
1104
1105 }
1106
1107 }
1108 else
1109 {
1110
1111 int movintYN = 0;
1112 // prim terrain contact
1113 if (Math.Abs(p2.Velocity.X) > 0.01f || Math.Abs(p2.Velocity.Y) > 0.01f)
1114 {
1115 movintYN = 1;
1116 }
1117
1118 int material = (int)Material.Wood;
1119
1120 if (p2 is OdePrim)
1121 material = ((OdePrim)p2).m_material;
1122 //m_log.DebugFormat("Material: {0}", material);
1123 m_materialContacts[material, movintYN].geom = curContact;
1124 _perloopContact.Add(curContact);
1125
1126 if (m_global_contactcount < maxContactsbeforedeath)
1127 {
1128 joint = d.JointCreateContact(world, contactgroup, ref m_materialContacts[material, movintYN]);
1129 m_global_contactcount++;
1130
1131 }
1132 }
1133 }
1134 }
1135 //if (p2.PhysicsActorType == (int)ActorTypes.Prim)
1136 //{
1137 //m_log.Debug("[PHYSICS]: prim contacting with ground");
1138 //}
1139 }
1140 else if (name1 == "Water" || name2 == "Water")
1141 {
1142 /*
1143 if ((p2.PhysicsActorType == (int) ActorTypes.Prim))
1144 {
1145 }
1146 else
1147 {
1148 }
1149 */
1150 //WaterContact.surface.soft_cfm = 0.0000f;
1151 //WaterContact.surface.soft_erp = 0.00000f;
1152 if (curContact.depth > 0.1f)
1153 {
1154 curContact.depth *= 52;
1155 //contact.normal = new d.Vector3(0, 0, 1);
1156 //contact.pos = new d.Vector3(0, 0, contact.pos.Z - 5f);
1157 }
1158 WaterContact.geom = curContact;
1159 _perloopContact.Add(curContact);
1160 if (m_global_contactcount < maxContactsbeforedeath)
1161 {
1162 joint = d.JointCreateContact(world, contactgroup, ref WaterContact);
1163 m_global_contactcount++;
1164 }
1165 //m_log.Info("[PHYSICS]: Prim Water Contact" + contact.depth);
1166 }
1167 else
1168 {
1169 // we're colliding with prim or avatar
1170 // check if we're moving
1171 if ((p2.PhysicsActorType == (int)ActorTypes.Agent))
1172 {
1173 if ((Math.Abs(p2.Velocity.X) > 0.01f || Math.Abs(p2.Velocity.Y) > 0.01f))
1174 {
1175 // Use the Movement prim contact
1176 AvatarMovementprimContact.geom = curContact;
1177 _perloopContact.Add(curContact);
1178 if (m_global_contactcount < maxContactsbeforedeath)
1179 {
1180 joint = d.JointCreateContact(world, contactgroup, ref AvatarMovementprimContact);
1181 m_global_contactcount++;
1182 }
1183 }
1184 else
1185 {
1186 // Use the non movement contact
1187 contact.geom = curContact;
1188 _perloopContact.Add(curContact);
1189
1190 if (m_global_contactcount < maxContactsbeforedeath)
1191 {
1192 joint = d.JointCreateContact(world, contactgroup, ref contact);
1193 m_global_contactcount++;
1194 }
1195 }
1196 }
1197 else if (p2.PhysicsActorType == (int)ActorTypes.Prim)
1198 {
1199 //p1.PhysicsActorType
1200 int material = (int)Material.Wood;
1201
1202 if (p2 is OdePrim)
1203 material = ((OdePrim)p2).m_material;
1204
1205 //m_log.DebugFormat("Material: {0}", material);
1206 m_materialContacts[material, 0].geom = curContact;
1207 _perloopContact.Add(curContact);
1208
1209 if (m_global_contactcount < maxContactsbeforedeath)
1210 {
1211 joint = d.JointCreateContact(world, contactgroup, ref m_materialContacts[material, 0]);
1212 m_global_contactcount++;
1213
1214 }
1215 }
1216 }
1217
1218 if (m_global_contactcount < maxContactsbeforedeath && joint != IntPtr.Zero) // stack collide!
1219 {
1220 d.JointAttach(joint, b1, b2);
1221 m_global_contactcount++;
1222 }
1223
1224 }
1225 collision_accounting_events(p1, p2, maxDepthContact);
1226 if (count > geomContactPointsStartthrottle)
1227 {
1228 // If there are more then 3 contact points, it's likely
1229 // that we've got a pile of objects, so ...
1230 // We don't want to send out hundreds of terse updates over and over again
1231 // so lets throttle them and send them again after it's somewhat sorted out.
1232 p2.ThrottleUpdates = true;
1233 }
1234 //m_log.Debug(count.ToString());
1235 //m_log.Debug("near: A collision was detected between {1} and {2}", 0, name1, name2);
1236 }
1237 }
1238
1239 private bool checkDupe(d.ContactGeom contactGeom, int atype)
1240 {
1241 bool result = false;
1242 //return result;
1243 if (!m_filterCollisions)
1244 return false;
1245
1246 ActorTypes at = (ActorTypes)atype;
1247 lock (_perloopContact)
1248 {
1249 foreach (d.ContactGeom contact in _perloopContact)
1250 {
1251 //if ((contact.g1 == contactGeom.g1 && contact.g2 == contactGeom.g2))
1252 //{
1253 // || (contact.g2 == contactGeom.g1 && contact.g1 == contactGeom.g2)
1254 if (at == ActorTypes.Agent)
1255 {
1256 if (((Math.Abs(contactGeom.normal.X - contact.normal.X) < 1.026f) && (Math.Abs(contactGeom.normal.Y - contact.normal.Y) < 0.303f) && (Math.Abs(contactGeom.normal.Z - contact.normal.Z) < 0.065f)) && contactGeom.g1 != LandGeom && contactGeom.g2 != LandGeom)
1257 {
1258
1259 if (Math.Abs(contact.depth - contactGeom.depth) < 0.052f)
1260 {
1261 //contactGeom.depth *= .00005f;
1262 //m_log.DebugFormat("[Collsion]: Depth {0}", Math.Abs(contact.depth - contactGeom.depth));
1263 // m_log.DebugFormat("[Collision]: <{0},{1},{2}>", Math.Abs(contactGeom.normal.X - contact.normal.X), Math.Abs(contactGeom.normal.Y - contact.normal.Y), Math.Abs(contactGeom.normal.Z - contact.normal.Z));
1264 result = true;
1265 break;
1266 }
1267 else
1268 {
1269 //m_log.DebugFormat("[Collsion]: Depth {0}", Math.Abs(contact.depth - contactGeom.depth));
1270 }
1271 }
1272 else
1273 {
1274 //m_log.DebugFormat("[Collision]: <{0},{1},{2}>", Math.Abs(contactGeom.normal.X - contact.normal.X), Math.Abs(contactGeom.normal.Y - contact.normal.Y), Math.Abs(contactGeom.normal.Z - contact.normal.Z));
1275 //int i = 0;
1276 }
1277 }
1278 else if (at == ActorTypes.Prim)
1279 {
1280 //d.AABB aabb1 = new d.AABB();
1281 //d.AABB aabb2 = new d.AABB();
1282
1283 //d.GeomGetAABB(contactGeom.g2, out aabb2);
1284 //d.GeomGetAABB(contactGeom.g1, out aabb1);
1285 //aabb1.
1286 if (((Math.Abs(contactGeom.normal.X - contact.normal.X) < 1.026f) && (Math.Abs(contactGeom.normal.Y - contact.normal.Y) < 0.303f) && (Math.Abs(contactGeom.normal.Z - contact.normal.Z) < 0.065f)) && contactGeom.g1 != LandGeom && contactGeom.g2 != LandGeom)
1287 {
1288 if (contactGeom.normal.X == contact.normal.X && contactGeom.normal.Y == contact.normal.Y && contactGeom.normal.Z == contact.normal.Z)
1289 {
1290 if (Math.Abs(contact.depth - contactGeom.depth) < 0.272f)
1291 {
1292 result = true;
1293 break;
1294 }
1295 }
1296 //m_log.DebugFormat("[Collsion]: Depth {0}", Math.Abs(contact.depth - contactGeom.depth));
1297 //m_log.DebugFormat("[Collision]: <{0},{1},{2}>", Math.Abs(contactGeom.normal.X - contact.normal.X), Math.Abs(contactGeom.normal.Y - contact.normal.Y), Math.Abs(contactGeom.normal.Z - contact.normal.Z));
1298 }
1299
1300 }
1301
1302 //}
1303
1304 }
1305 }
1306 return result;
1307 }
1308
1309 private void collision_accounting_events(PhysicsActor p1, PhysicsActor p2, ContactPoint contact)
1310 {
1311 // obj1LocalID = 0;
1312 //returncollisions = false;
1313 obj2LocalID = 0;
1314 //ctype = 0;
1315 //cStartStop = 0;
1316 if (!p2.SubscribedEvents() && !p1.SubscribedEvents())
1317 return;
1318
1319 switch ((ActorTypes)p2.PhysicsActorType)
1320 {
1321 case ActorTypes.Agent:
1322 cc2 = (OdeCharacter)p2;
1323
1324 // obj1LocalID = cc2.m_localID;
1325 switch ((ActorTypes)p1.PhysicsActorType)
1326 {
1327 case ActorTypes.Agent:
1328 cc1 = (OdeCharacter)p1;
1329 obj2LocalID = cc1.m_localID;
1330 cc1.AddCollisionEvent(cc2.m_localID, contact);
1331 //ctype = (int)CollisionCategories.Character;
1332
1333 //if (cc1.CollidingObj)
1334 //cStartStop = (int)StatusIndicators.Generic;
1335 //else
1336 //cStartStop = (int)StatusIndicators.Start;
1337
1338 //returncollisions = true;
1339 break;
1340 case ActorTypes.Prim:
1341 if (p1 is OdePrim)
1342 {
1343 cp1 = (OdePrim) p1;
1344 obj2LocalID = cp1.m_localID;
1345 cp1.AddCollisionEvent(cc2.m_localID, contact);
1346 }
1347 //ctype = (int)CollisionCategories.Geom;
1348
1349 //if (cp1.CollidingObj)
1350 //cStartStop = (int)StatusIndicators.Generic;
1351 //else
1352 //cStartStop = (int)StatusIndicators.Start;
1353
1354 //returncollisions = true;
1355 break;
1356
1357 case ActorTypes.Ground:
1358 case ActorTypes.Unknown:
1359 obj2LocalID = 0;
1360 //ctype = (int)CollisionCategories.Land;
1361 //returncollisions = true;
1362 break;
1363 }
1364
1365 cc2.AddCollisionEvent(obj2LocalID, contact);
1366 break;
1367 case ActorTypes.Prim:
1368
1369 if (p2 is OdePrim)
1370 {
1371 cp2 = (OdePrim) p2;
1372
1373 // obj1LocalID = cp2.m_localID;
1374 switch ((ActorTypes) p1.PhysicsActorType)
1375 {
1376 case ActorTypes.Agent:
1377 if (p1 is OdeCharacter)
1378 {
1379 cc1 = (OdeCharacter) p1;
1380 obj2LocalID = cc1.m_localID;
1381 cc1.AddCollisionEvent(cp2.m_localID, contact);
1382 //ctype = (int)CollisionCategories.Character;
1383
1384 //if (cc1.CollidingObj)
1385 //cStartStop = (int)StatusIndicators.Generic;
1386 //else
1387 //cStartStop = (int)StatusIndicators.Start;
1388 //returncollisions = true;
1389 }
1390 break;
1391 case ActorTypes.Prim:
1392
1393 if (p1 is OdePrim)
1394 {
1395 cp1 = (OdePrim) p1;
1396 obj2LocalID = cp1.m_localID;
1397 cp1.AddCollisionEvent(cp2.m_localID, contact);
1398 //ctype = (int)CollisionCategories.Geom;
1399
1400 //if (cp1.CollidingObj)
1401 //cStartStop = (int)StatusIndicators.Generic;
1402 //else
1403 //cStartStop = (int)StatusIndicators.Start;
1404
1405 //returncollisions = true;
1406 }
1407 break;
1408
1409 case ActorTypes.Ground:
1410 case ActorTypes.Unknown:
1411 obj2LocalID = 0;
1412 //ctype = (int)CollisionCategories.Land;
1413
1414 //returncollisions = true;
1415 break;
1416 }
1417
1418 cp2.AddCollisionEvent(obj2LocalID, contact);
1419 }
1420 break;
1421 }
1422 //if (returncollisions)
1423 //{
1424
1425 //lock (m_storedCollisions)
1426 //{
1427 //cDictKey = obj1LocalID.ToString() + obj2LocalID.ToString() + cStartStop.ToString() + ctype.ToString();
1428 //if (m_storedCollisions.ContainsKey(cDictKey))
1429 //{
1430 //sCollisionData objd = m_storedCollisions[cDictKey];
1431 //objd.NumberOfCollisions += 1;
1432 //objd.lastframe = framecount;
1433 //m_storedCollisions[cDictKey] = objd;
1434 //}
1435 //else
1436 //{
1437 //sCollisionData objd = new sCollisionData();
1438 //objd.ColliderLocalId = obj1LocalID;
1439 //objd.CollidedWithLocalId = obj2LocalID;
1440 //objd.CollisionType = ctype;
1441 //objd.NumberOfCollisions = 1;
1442 //objd.lastframe = framecount;
1443 //objd.StatusIndicator = cStartStop;
1444 //m_storedCollisions.Add(cDictKey, objd);
1445 //}
1446 //}
1447 // }
1448 }
1449
1450 public int TriArrayCallback(IntPtr trimesh, IntPtr refObject, int[] triangleIndex, int triCount)
1451 {
1452 /* String name1 = null;
1453 String name2 = null;
1454
1455 if (!geom_name_map.TryGetValue(trimesh, out name1))
1456 {
1457 name1 = "null";
1458 }
1459 if (!geom_name_map.TryGetValue(refObject, out name2))
1460 {
1461 name2 = "null";
1462 }
1463
1464 m_log.InfoFormat("TriArrayCallback: A collision was detected between {1} and {2}", 0, name1, name2);
1465 */
1466 return 1;
1467 }
1468
1469 public int TriCallback(IntPtr trimesh, IntPtr refObject, int triangleIndex)
1470 {
1471 String name1 = null;
1472 String name2 = null;
1473
1474 if (!geom_name_map.TryGetValue(trimesh, out name1))
1475 {
1476 name1 = "null";
1477 }
1478
1479 if (!geom_name_map.TryGetValue(refObject, out name2))
1480 {
1481 name2 = "null";
1482 }
1483
1484 // m_log.InfoFormat("TriCallback: A collision was detected between {1} and {2}. Index was {3}", 0, name1, name2, triangleIndex);
1485
1486 d.Vector3 v0 = new d.Vector3();
1487 d.Vector3 v1 = new d.Vector3();
1488 d.Vector3 v2 = new d.Vector3();
1489
1490 d.GeomTriMeshGetTriangle(trimesh, 0, ref v0, ref v1, ref v2);
1491 // m_log.DebugFormat("Triangle {0} is <{1},{2},{3}>, <{4},{5},{6}>, <{7},{8},{9}>", triangleIndex, v0.X, v0.Y, v0.Z, v1.X, v1.Y, v1.Z, v2.X, v2.Y, v2.Z);
1492
1493 return 1;
1494 }
1495
1496 /// <summary>
1497 /// This is our collision testing routine in ODE
1498 /// </summary>
1499 /// <param name="timeStep"></param>
1500 private void collision_optimized(float timeStep)
1501 {
1502 _perloopContact.Clear();
1503
1504 lock (_characters)
1505 {
1506 foreach (OdeCharacter chr in _characters)
1507 {
1508 // Reset the collision values to false
1509 // since we don't know if we're colliding yet
1510
1511 // For some reason this can happen. Don't ask...
1512 //
1513 if (chr == null)
1514 continue;
1515
1516 if (chr.Shell == IntPtr.Zero || chr.Body == IntPtr.Zero)
1517 continue;
1518
1519 chr.IsColliding = false;
1520 chr.CollidingGround = false;
1521 chr.CollidingObj = false;
1522
1523 // test the avatar's geometry for collision with the space
1524 // This will return near and the space that they are the closest to
1525 // And we'll run this again against the avatar and the space segment
1526 // This will return with a bunch of possible objects in the space segment
1527 // and we'll run it again on all of them.
1528 try
1529 {
1530 d.SpaceCollide2(space, chr.Shell, IntPtr.Zero, nearCallback);
1531 }
1532 catch (AccessViolationException)
1533 {
1534 m_log.Warn("[PHYSICS]: Unable to space collide");
1535 }
1536 //float terrainheight = GetTerrainHeightAtXY(chr.Position.X, chr.Position.Y);
1537 //if (chr.Position.Z + (chr.Velocity.Z * timeStep) < terrainheight + 10)
1538 //{
1539 //chr.Position.Z = terrainheight + 10.0f;
1540 //forcedZ = true;
1541 //}
1542 }
1543 }
1544
1545 lock (_activeprims)
1546 {
1547 List<OdePrim> removeprims = null;
1548 foreach (OdePrim chr in _activeprims)
1549 {
1550 if (chr.Body != IntPtr.Zero && d.BodyIsEnabled(chr.Body) && (!chr.m_disabled))
1551 {
1552 try
1553 {
1554 lock (chr)
1555 {
1556 if (space != IntPtr.Zero && chr.prim_geom != IntPtr.Zero && chr.m_taintremove == false)
1557 {
1558 d.SpaceCollide2(space, chr.prim_geom, IntPtr.Zero, nearCallback);
1559 }
1560 else
1561 {
1562 if (removeprims == null)
1563 {
1564 removeprims = new List<OdePrim>();
1565 }
1566 removeprims.Add(chr);
1567 m_log.Debug("[PHYSICS]: unable to collide test active prim against space. The space was zero, the geom was zero or it was in the process of being removed. Removed it from the active prim list. This needs to be fixed!");
1568 }
1569 }
1570 }
1571 catch (AccessViolationException)
1572 {
1573 m_log.Warn("[PHYSICS]: Unable to space collide");
1574 }
1575 }
1576 }
1577 if (removeprims != null)
1578 {
1579 foreach (OdePrim chr in removeprims)
1580 {
1581 _activeprims.Remove(chr);
1582 }
1583 }
1584 }
1585
1586 _perloopContact.Clear();
1587 }
1588
1589 #endregion
1590
1591 public override void Combine(PhysicsScene pScene, Vector3 offset, Vector3 extents)
1592 {
1593 m_worldOffset = offset;
1594 WorldExtents = new Vector2(extents.X, extents.Y);
1595 m_parentScene = pScene;
1596
1597 }
1598
1599 // Recovered for use by fly height. Kitto Flora
1600 public float GetTerrainHeightAtXY(float x, float y)
1601 {
1602
1603 int offsetX = ((int)(x / (int)Constants.RegionSize)) * (int)Constants.RegionSize;
1604 int offsetY = ((int)(y / (int)Constants.RegionSize)) * (int)Constants.RegionSize;
1605
1606 IntPtr heightFieldGeom = IntPtr.Zero;
1607
1608 if (RegionTerrain.TryGetValue(new Vector3(offsetX,offsetY,0), out heightFieldGeom))
1609 {
1610 if (heightFieldGeom != IntPtr.Zero)
1611 {
1612 if (TerrainHeightFieldHeights.ContainsKey(heightFieldGeom))
1613 {
1614
1615 int index;
1616
1617
1618 if ((int)x > WorldExtents.X || (int)y > WorldExtents.Y ||
1619 (int)x < 0.001f || (int)y < 0.001f)
1620 return 0;
1621
1622 x = x - offsetX;
1623 y = y - offsetY;
1624
1625 index = (int)((int)x * ((int)Constants.RegionSize + 2) + (int)y);
1626
1627 if (index < TerrainHeightFieldHeights[heightFieldGeom].Length)
1628 {
1629 //m_log.DebugFormat("x{0} y{1} = {2}", x, y, (float)TerrainHeightFieldHeights[heightFieldGeom][index]);
1630 return (float)TerrainHeightFieldHeights[heightFieldGeom][index];
1631 }
1632
1633 else
1634 return 0f;
1635 }
1636 else
1637 {
1638 return 0f;
1639 }
1640
1641 }
1642 else
1643 {
1644 return 0f;
1645 }
1646
1647 }
1648 else
1649 {
1650 return 0f;
1651 }
1652
1653
1654 }
1655// End recovered. Kitto Flora
1656
1657 public void addCollisionEventReporting(PhysicsActor obj)
1658 {
1659 lock (_collisionEventPrim)
1660 {
1661 if (!_collisionEventPrim.Contains(obj))
1662 _collisionEventPrim.Add(obj);
1663 }
1664 }
1665
1666 public void remCollisionEventReporting(PhysicsActor obj)
1667 {
1668 lock (_collisionEventPrim)
1669 {
1670 if (!_collisionEventPrim.Contains(obj))
1671 _collisionEventPrim.Remove(obj);
1672 }
1673 }
1674
1675 #region Add/Remove Entities
1676
1677 public override PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying)
1678 {
1679 Vector3 pos;
1680 pos.X = position.X;
1681 pos.Y = position.Y;
1682 pos.Z = position.Z;
1683 OdeCharacter newAv = new OdeCharacter(avName, this, pos, ode, size, avPIDD, avPIDP, avCapRadius, avStandupTensor, avDensity, avHeightFudgeFactor, avMovementDivisorWalk, avMovementDivisorRun);
1684 newAv.Flying = isFlying;
1685 newAv.MinimumGroundFlightOffset = minimumGroundFlightOffset;
1686
1687 return newAv;
1688 }
1689
1690 public void AddCharacter(OdeCharacter chr)
1691 {
1692 lock (_characters)
1693 {
1694 if (!_characters.Contains(chr))
1695 {
1696 _characters.Add(chr);
1697 if (chr.bad)
1698 m_log.DebugFormat("[PHYSICS] Added BAD actor {0} to characters list", chr.m_uuid);
1699 }
1700 }
1701 }
1702
1703 public void RemoveCharacter(OdeCharacter chr)
1704 {
1705 lock (_characters)
1706 {
1707 if (_characters.Contains(chr))
1708 {
1709 _characters.Remove(chr);
1710 }
1711 }
1712 }
1713 public void BadCharacter(OdeCharacter chr)
1714 {
1715 lock (_badCharacter)
1716 {
1717 if (!_badCharacter.Contains(chr))
1718 _badCharacter.Add(chr);
1719 }
1720 }
1721
1722 public override void RemoveAvatar(PhysicsActor actor)
1723 {
1724 //m_log.Debug("[PHYSICS]:ODELOCK");
1725 ((OdeCharacter) actor).Destroy();
1726
1727 }
1728
1729 private PhysicsActor AddPrim(String name, Vector3 position, Vector3 size, Quaternion rotation,
1730 IMesh mesh, PrimitiveBaseShape pbs, bool isphysical)
1731 {
1732
1733 Vector3 pos = position;
1734 Vector3 siz = size;
1735 Quaternion rot = rotation;
1736
1737 OdePrim newPrim;
1738 lock (OdeLock)
1739 {
1740 newPrim = new OdePrim(name, this, pos, siz, rot, mesh, pbs, isphysical, ode);
1741
1742 lock (_prims)
1743 _prims.Add(newPrim);
1744 }
1745
1746 return newPrim;
1747 }
1748
1749 public void addActivePrim(OdePrim activatePrim)
1750 {
1751 // adds active prim.. (ones that should be iterated over in collisions_optimized
1752 lock (_activeprims)
1753 {
1754 if (!_activeprims.Contains(activatePrim))
1755 _activeprims.Add(activatePrim);
1756 //else
1757 // m_log.Warn("[PHYSICS]: Double Entry in _activeprims detected, potential crash immenent");
1758 }
1759 }
1760
1761 public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
1762 Vector3 size, Quaternion rotation) //To be removed
1763 {
1764 return AddPrimShape(primName, pbs, position, size, rotation, false);
1765 }
1766
1767 public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
1768 Vector3 size, Quaternion rotation, bool isPhysical)
1769 {
1770 PhysicsActor result;
1771 IMesh mesh = null;
1772
1773 if (needsMeshing(pbs))
1774 mesh = mesher.CreateMesh(primName, pbs, size, 32f, isPhysical);
1775
1776 result = AddPrim(primName, position, size, rotation, mesh, pbs, isPhysical);
1777
1778 return result;
1779 }
1780
1781 public override float TimeDilation
1782 {
1783 get { return m_timeDilation; }
1784 }
1785
1786 public override bool SupportsNINJAJoints
1787 {
1788 get { return m_NINJA_physics_joints_enabled; }
1789 }
1790
1791 // internal utility function: must be called within a lock (OdeLock)
1792 private void InternalAddActiveJoint(PhysicsJoint joint)
1793 {
1794 activeJoints.Add(joint);
1795 SOPName_to_activeJoint.Add(joint.ObjectNameInScene, joint);
1796 }
1797
1798 // internal utility function: must be called within a lock (OdeLock)
1799 private void InternalAddPendingJoint(OdePhysicsJoint joint)
1800 {
1801 pendingJoints.Add(joint);
1802 SOPName_to_pendingJoint.Add(joint.ObjectNameInScene, joint);
1803 }
1804
1805 // internal utility function: must be called within a lock (OdeLock)
1806 private void InternalRemovePendingJoint(PhysicsJoint joint)
1807 {
1808 pendingJoints.Remove(joint);
1809 SOPName_to_pendingJoint.Remove(joint.ObjectNameInScene);
1810 }
1811
1812 // internal utility function: must be called within a lock (OdeLock)
1813 private void InternalRemoveActiveJoint(PhysicsJoint joint)
1814 {
1815 activeJoints.Remove(joint);
1816 SOPName_to_activeJoint.Remove(joint.ObjectNameInScene);
1817 }
1818
1819 public override void DumpJointInfo()
1820 {
1821 string hdr = "[NINJA] JOINTINFO: ";
1822 foreach (PhysicsJoint j in pendingJoints)
1823 {
1824 m_log.Debug(hdr + " pending joint, Name: " + j.ObjectNameInScene + " raw parms:" + j.RawParams);
1825 }
1826 m_log.Debug(hdr + pendingJoints.Count + " total pending joints");
1827 foreach (string jointName in SOPName_to_pendingJoint.Keys)
1828 {
1829 m_log.Debug(hdr + " pending joints dict contains Name: " + jointName);
1830 }
1831 m_log.Debug(hdr + SOPName_to_pendingJoint.Keys.Count + " total pending joints dict entries");
1832 foreach (PhysicsJoint j in activeJoints)
1833 {
1834 m_log.Debug(hdr + " active joint, Name: " + j.ObjectNameInScene + " raw parms:" + j.RawParams);
1835 }
1836 m_log.Debug(hdr + activeJoints.Count + " total active joints");
1837 foreach (string jointName in SOPName_to_activeJoint.Keys)
1838 {
1839 m_log.Debug(hdr + " active joints dict contains Name: " + jointName);
1840 }
1841 m_log.Debug(hdr + SOPName_to_activeJoint.Keys.Count + " total active joints dict entries");
1842
1843 m_log.Debug(hdr + " Per-body joint connectivity information follows.");
1844 m_log.Debug(hdr + joints_connecting_actor.Keys.Count + " bodies are connected by joints.");
1845 foreach (string actorName in joints_connecting_actor.Keys)
1846 {
1847 m_log.Debug(hdr + " Actor " + actorName + " has the following joints connecting it");
1848 foreach (PhysicsJoint j in joints_connecting_actor[actorName])
1849 {
1850 m_log.Debug(hdr + " * joint Name: " + j.ObjectNameInScene + " raw parms:" + j.RawParams);
1851 }
1852 m_log.Debug(hdr + joints_connecting_actor[actorName].Count + " connecting joints total for this actor");
1853 }
1854 }
1855
1856 public override void RequestJointDeletion(string ObjectNameInScene)
1857 {
1858 lock (externalJointRequestsLock)
1859 {
1860 if (!requestedJointsToBeDeleted.Contains(ObjectNameInScene)) // forbid same deletion request from entering twice to prevent spurious deletions processed asynchronously
1861 {
1862 requestedJointsToBeDeleted.Add(ObjectNameInScene);
1863 }
1864 }
1865 }
1866
1867 private void DeleteRequestedJoints()
1868 {
1869 List<string> myRequestedJointsToBeDeleted;
1870 lock (externalJointRequestsLock)
1871 {
1872 // make a local copy of the shared list for processing (threading issues)
1873 myRequestedJointsToBeDeleted = new List<string>(requestedJointsToBeDeleted);
1874 }
1875
1876 foreach (string jointName in myRequestedJointsToBeDeleted)
1877 {
1878 lock (OdeLock)
1879 {
1880 //m_log.Debug("[NINJA] trying to deleting requested joint " + jointName);
1881 if (SOPName_to_activeJoint.ContainsKey(jointName) || SOPName_to_pendingJoint.ContainsKey(jointName))
1882 {
1883 OdePhysicsJoint joint = null;
1884 if (SOPName_to_activeJoint.ContainsKey(jointName))
1885 {
1886 joint = SOPName_to_activeJoint[jointName] as OdePhysicsJoint;
1887 InternalRemoveActiveJoint(joint);
1888 }
1889 else if (SOPName_to_pendingJoint.ContainsKey(jointName))
1890 {
1891 joint = SOPName_to_pendingJoint[jointName] as OdePhysicsJoint;
1892 InternalRemovePendingJoint(joint);
1893 }
1894
1895 if (joint != null)
1896 {
1897 //m_log.Debug("joint.BodyNames.Count is " + joint.BodyNames.Count + " and contents " + joint.BodyNames);
1898 for (int iBodyName = 0; iBodyName < 2; iBodyName++)
1899 {
1900 string bodyName = joint.BodyNames[iBodyName];
1901 if (bodyName != "NULL")
1902 {
1903 joints_connecting_actor[bodyName].Remove(joint);
1904 if (joints_connecting_actor[bodyName].Count == 0)
1905 {
1906 joints_connecting_actor.Remove(bodyName);
1907 }
1908 }
1909 }
1910
1911 DoJointDeactivated(joint);
1912 if (joint.jointID != IntPtr.Zero)
1913 {
1914 d.JointDestroy(joint.jointID);
1915 joint.jointID = IntPtr.Zero;
1916 //DoJointErrorMessage(joint, "successfully destroyed joint " + jointName);
1917 }
1918 else
1919 {
1920 //m_log.Warn("[NINJA] Ignoring re-request to destroy joint " + jointName);
1921 }
1922 }
1923 else
1924 {
1925 // DoJointErrorMessage(joint, "coult not find joint to destroy based on name " + jointName);
1926 }
1927 }
1928 else
1929 {
1930 // DoJointErrorMessage(joint, "WARNING - joint removal failed, joint " + jointName);
1931 }
1932 }
1933 }
1934
1935 // remove processed joints from the shared list
1936 lock (externalJointRequestsLock)
1937 {
1938 foreach (string jointName in myRequestedJointsToBeDeleted)
1939 {
1940 requestedJointsToBeDeleted.Remove(jointName);
1941 }
1942 }
1943 }
1944
1945 // for pending joints we don't know if their associated bodies exist yet or not.
1946 // the joint is actually created during processing of the taints
1947 private void CreateRequestedJoints()
1948 {
1949 List<PhysicsJoint> myRequestedJointsToBeCreated;
1950 lock (externalJointRequestsLock)
1951 {
1952 // make a local copy of the shared list for processing (threading issues)
1953 myRequestedJointsToBeCreated = new List<PhysicsJoint>(requestedJointsToBeCreated);
1954 }
1955
1956 foreach (PhysicsJoint joint in myRequestedJointsToBeCreated)
1957 {
1958 lock (OdeLock)
1959 {
1960 if (SOPName_to_pendingJoint.ContainsKey(joint.ObjectNameInScene) && SOPName_to_pendingJoint[joint.ObjectNameInScene] != null)
1961 {
1962 DoJointErrorMessage(joint, "WARNING: ignoring request to re-add already pending joint Name:" + joint.ObjectNameInScene + " type:" + joint.Type + " parms: " + joint.RawParams + " pos: " + joint.Position + " rot:" + joint.Rotation);
1963 continue;
1964 }
1965 if (SOPName_to_activeJoint.ContainsKey(joint.ObjectNameInScene) && SOPName_to_activeJoint[joint.ObjectNameInScene] != null)
1966 {
1967 DoJointErrorMessage(joint, "WARNING: ignoring request to re-add already active joint Name:" + joint.ObjectNameInScene + " type:" + joint.Type + " parms: " + joint.RawParams + " pos: " + joint.Position + " rot:" + joint.Rotation);
1968 continue;
1969 }
1970
1971 InternalAddPendingJoint(joint as OdePhysicsJoint);
1972
1973 if (joint.BodyNames.Count >= 2)
1974 {
1975 for (int iBodyName = 0; iBodyName < 2; iBodyName++)
1976 {
1977 string bodyName = joint.BodyNames[iBodyName];
1978 if (bodyName != "NULL")
1979 {
1980 if (!joints_connecting_actor.ContainsKey(bodyName))
1981 {
1982 joints_connecting_actor.Add(bodyName, new List<PhysicsJoint>());
1983 }
1984 joints_connecting_actor[bodyName].Add(joint);
1985 }
1986 }
1987 }
1988 }
1989 }
1990
1991 // remove processed joints from shared list
1992 lock (externalJointRequestsLock)
1993 {
1994 foreach (PhysicsJoint joint in myRequestedJointsToBeCreated)
1995 {
1996 requestedJointsToBeCreated.Remove(joint);
1997 }
1998 }
1999
2000 }
2001
2002 // public function to add an request for joint creation
2003 // this joint will just be added to a waiting list that is NOT processed during the main
2004 // Simulate() loop (to avoid deadlocks). After Simulate() is finished, we handle unprocessed joint requests.
2005
2006 public override PhysicsJoint RequestJointCreation(string objectNameInScene, PhysicsJointType jointType, Vector3 position,
2007 Quaternion rotation, string parms, List<string> bodyNames, string trackedBodyName, Quaternion localRotation)
2008
2009 {
2010
2011 OdePhysicsJoint joint = new OdePhysicsJoint();
2012 joint.ObjectNameInScene = objectNameInScene;
2013 joint.Type = jointType;
2014 joint.Position = position;
2015 joint.Rotation = rotation;
2016 joint.RawParams = parms;
2017 joint.BodyNames = new List<string>(bodyNames);
2018 joint.TrackedBodyName = trackedBodyName;
2019 joint.LocalRotation = localRotation;
2020 joint.jointID = IntPtr.Zero;
2021 joint.ErrorMessageCount = 0;
2022
2023 lock (externalJointRequestsLock)
2024 {
2025 if (!requestedJointsToBeCreated.Contains(joint)) // forbid same creation request from entering twice
2026 {
2027 requestedJointsToBeCreated.Add(joint);
2028 }
2029 }
2030 return joint;
2031 }
2032
2033 private void RemoveAllJointsConnectedToActor(PhysicsActor actor)
2034 {
2035 //m_log.Debug("RemoveAllJointsConnectedToActor: start");
2036 if (actor.SOPName != null && joints_connecting_actor.ContainsKey(actor.SOPName) && joints_connecting_actor[actor.SOPName] != null)
2037 {
2038
2039 List<PhysicsJoint> jointsToRemove = new List<PhysicsJoint>();
2040 //TODO: merge these 2 loops (originally it was needed to avoid altering a list being iterated over, but it is no longer needed due to the joint request queue mechanism)
2041 foreach (PhysicsJoint j in joints_connecting_actor[actor.SOPName])
2042 {
2043 jointsToRemove.Add(j);
2044 }
2045 foreach (PhysicsJoint j in jointsToRemove)
2046 {
2047 //m_log.Debug("RemoveAllJointsConnectedToActor: about to request deletion of " + j.ObjectNameInScene);
2048 RequestJointDeletion(j.ObjectNameInScene);
2049 //m_log.Debug("RemoveAllJointsConnectedToActor: done request deletion of " + j.ObjectNameInScene);
2050 j.TrackedBodyName = null; // *IMMEDIATELY* prevent any further movement of this joint (else a deleted actor might cause spurious tracking motion of the joint for a few frames, leading to the joint proxy object disappearing)
2051 }
2052 }
2053 }
2054
2055 public override void RemoveAllJointsConnectedToActorThreadLocked(PhysicsActor actor)
2056 {
2057 //m_log.Debug("RemoveAllJointsConnectedToActorThreadLocked: start");
2058 lock (OdeLock)
2059 {
2060 //m_log.Debug("RemoveAllJointsConnectedToActorThreadLocked: got lock");
2061 RemoveAllJointsConnectedToActor(actor);
2062 }
2063 }
2064
2065 // normally called from within OnJointMoved, which is called from within a lock (OdeLock)
2066 public override Vector3 GetJointAnchor(PhysicsJoint joint)
2067 {
2068 Debug.Assert(joint.IsInPhysicsEngine);
2069 d.Vector3 pos = new d.Vector3();
2070
2071 if (!(joint is OdePhysicsJoint))
2072 {
2073 DoJointErrorMessage(joint, "warning: non-ODE joint requesting anchor: " + joint.ObjectNameInScene);
2074 }
2075 else
2076 {
2077 OdePhysicsJoint odeJoint = (OdePhysicsJoint)joint;
2078 switch (odeJoint.Type)
2079 {
2080 case PhysicsJointType.Ball:
2081 d.JointGetBallAnchor(odeJoint.jointID, out pos);
2082 break;
2083 case PhysicsJointType.Hinge:
2084 d.JointGetHingeAnchor(odeJoint.jointID, out pos);
2085 break;
2086 }
2087 }
2088 return new Vector3(pos.X, pos.Y, pos.Z);
2089 }
2090
2091 // normally called from within OnJointMoved, which is called from within a lock (OdeLock)
2092 // WARNING: ODE sometimes returns <0,0,0> as the joint axis! Therefore this function
2093 // appears to be unreliable. Fortunately we can compute the joint axis ourselves by
2094 // keeping track of the joint's original orientation relative to one of the involved bodies.
2095 public override Vector3 GetJointAxis(PhysicsJoint joint)
2096 {
2097 Debug.Assert(joint.IsInPhysicsEngine);
2098 d.Vector3 axis = new d.Vector3();
2099
2100 if (!(joint is OdePhysicsJoint))
2101 {
2102 DoJointErrorMessage(joint, "warning: non-ODE joint requesting anchor: " + joint.ObjectNameInScene);
2103 }
2104 else
2105 {
2106 OdePhysicsJoint odeJoint = (OdePhysicsJoint)joint;
2107 switch (odeJoint.Type)
2108 {
2109 case PhysicsJointType.Ball:
2110 DoJointErrorMessage(joint, "warning - axis requested for ball joint: " + joint.ObjectNameInScene);
2111 break;
2112 case PhysicsJointType.Hinge:
2113 d.JointGetHingeAxis(odeJoint.jointID, out axis);
2114 break;
2115 }
2116 }
2117 return new Vector3(axis.X, axis.Y, axis.Z);
2118 }
2119
2120
2121 public void remActivePrim(OdePrim deactivatePrim)
2122 {
2123 lock (_activeprims)
2124 {
2125 _activeprims.Remove(deactivatePrim);
2126 }
2127 }
2128
2129 public override void RemovePrim(PhysicsActor prim)
2130 {
2131 if (prim is OdePrim)
2132 {
2133 lock (OdeLock)
2134 {
2135 OdePrim p = (OdePrim) prim;
2136
2137 p.setPrimForRemoval();
2138 AddPhysicsActorTaint(prim);
2139 //RemovePrimThreadLocked(p);
2140 }
2141 }
2142 }
2143
2144 /// <summary>
2145 /// This is called from within simulate but outside the locked portion
2146 /// We need to do our own locking here
2147 /// Essentially, we need to remove the prim from our space segment, whatever segment it's in.
2148 ///
2149 /// If there are no more prim in the segment, we need to empty (spacedestroy)the segment and reclaim memory
2150 /// that the space was using.
2151 /// </summary>
2152 /// <param name="prim"></param>
2153 public void RemovePrimThreadLocked(OdePrim prim)
2154 {
2155//Console.WriteLine("RemovePrimThreadLocked " + prim.m_primName);
2156 lock (prim)
2157 {
2158 remCollisionEventReporting(prim);
2159 lock (ode)
2160 {
2161 if (prim.prim_geom != IntPtr.Zero)
2162 {
2163 prim.ResetTaints();
2164
2165 if (prim.IsPhysical)
2166 {
2167 prim.disableBody();
2168 if (prim.childPrim)
2169 {
2170 prim.childPrim = false;
2171 prim.Body = IntPtr.Zero;
2172 prim.m_disabled = true;
2173 prim.IsPhysical = false;
2174 }
2175
2176
2177 }
2178 // we don't want to remove the main space
2179
2180 // If the geometry is in the targetspace, remove it from the target space
2181 //m_log.Warn(prim.m_targetSpace);
2182
2183 //if (prim.m_targetSpace != IntPtr.Zero)
2184 //{
2185 //if (d.SpaceQuery(prim.m_targetSpace, prim.prim_geom))
2186 //{
2187
2188 //if (d.GeomIsSpace(prim.m_targetSpace))
2189 //{
2190 //waitForSpaceUnlock(prim.m_targetSpace);
2191 //d.SpaceRemove(prim.m_targetSpace, prim.prim_geom);
2192 prim.m_targetSpace = IntPtr.Zero;
2193 //}
2194 //else
2195 //{
2196 // m_log.Info("[Physics]: Invalid Scene passed to 'removeprim from scene':" +
2197 //((OdePrim)prim).m_targetSpace.ToString());
2198 //}
2199
2200 //}
2201 //}
2202 //m_log.Warn(prim.prim_geom);
2203 try
2204 {
2205 if (prim.prim_geom != IntPtr.Zero)
2206 {
2207 d.GeomDestroy(prim.prim_geom);
2208 prim.prim_geom = IntPtr.Zero;
2209 }
2210 else
2211 {
2212 m_log.Warn("[PHYSICS]: Unable to remove prim from physics scene");
2213 }
2214 }
2215 catch (AccessViolationException)
2216 {
2217 m_log.Info("[PHYSICS]: Couldn't remove prim from physics scene, it was already be removed.");
2218 }
2219 lock (_prims)
2220 _prims.Remove(prim);
2221
2222 //If there are no more geometries in the sub-space, we don't need it in the main space anymore
2223 //if (d.SpaceGetNumGeoms(prim.m_targetSpace) == 0)
2224 //{
2225 //if (prim.m_targetSpace != null)
2226 //{
2227 //if (d.GeomIsSpace(prim.m_targetSpace))
2228 //{
2229 //waitForSpaceUnlock(prim.m_targetSpace);
2230 //d.SpaceRemove(space, prim.m_targetSpace);
2231 // free up memory used by the space.
2232 //d.SpaceDestroy(prim.m_targetSpace);
2233 //int[] xyspace = calculateSpaceArrayItemFromPos(prim.Position);
2234 //resetSpaceArrayItemToZero(xyspace[0], xyspace[1]);
2235 //}
2236 //else
2237 //{
2238 //m_log.Info("[Physics]: Invalid Scene passed to 'removeprim from scene':" +
2239 //((OdePrim) prim).m_targetSpace.ToString());
2240 //}
2241 //}
2242 //}
2243
2244 if (SupportsNINJAJoints)
2245 {
2246 RemoveAllJointsConnectedToActorThreadLocked(prim);
2247 }
2248 }
2249 }
2250 }
2251 }
2252
2253 #endregion
2254
2255 #region Space Separation Calculation
2256
2257 /// <summary>
2258 /// Takes a space pointer and zeros out the array we're using to hold the spaces
2259 /// </summary>
2260 /// <param name="pSpace"></param>
2261 public void resetSpaceArrayItemToZero(IntPtr pSpace)
2262 {
2263 for (int x = 0; x < staticPrimspace.GetLength(0); x++)
2264 {
2265 for (int y = 0; y < staticPrimspace.GetLength(1); y++)
2266 {
2267 if (staticPrimspace[x, y] == pSpace)
2268 staticPrimspace[x, y] = IntPtr.Zero;
2269 }
2270 }
2271 }
2272
2273 public void resetSpaceArrayItemToZero(int arrayitemX, int arrayitemY)
2274 {
2275 staticPrimspace[arrayitemX, arrayitemY] = IntPtr.Zero;
2276 }
2277
2278 /// <summary>
2279 /// Called when a static prim moves. Allocates a space for the prim based on its position
2280 /// </summary>
2281 /// <param name="geom">the pointer to the geom that moved</param>
2282 /// <param name="pos">the position that the geom moved to</param>
2283 /// <param name="currentspace">a pointer to the space it was in before it was moved.</param>
2284 /// <returns>a pointer to the new space it's in</returns>
2285 public IntPtr recalculateSpaceForGeom(IntPtr geom, Vector3 pos, IntPtr currentspace)
2286 {
2287 // Called from setting the Position and Size of an ODEPrim so
2288 // it's already in locked space.
2289
2290 // we don't want to remove the main space
2291 // we don't need to test physical here because this function should
2292 // never be called if the prim is physical(active)
2293
2294 // All physical prim end up in the root space
2295 //Thread.Sleep(20);
2296 if (currentspace != space)
2297 {
2298 //m_log.Info("[SPACE]: C:" + currentspace.ToString() + " g:" + geom.ToString());
2299 //if (currentspace == IntPtr.Zero)
2300 //{
2301 //int adfadf = 0;
2302 //}
2303 if (d.SpaceQuery(currentspace, geom) && currentspace != IntPtr.Zero)
2304 {
2305 if (d.GeomIsSpace(currentspace))
2306 {
2307 waitForSpaceUnlock(currentspace);
2308 d.SpaceRemove(currentspace, geom);
2309 }
2310 else
2311 {
2312 m_log.Info("[Physics]: Invalid Scene passed to 'recalculatespace':" + currentspace +
2313 " Geom:" + geom);
2314 }
2315 }
2316 else
2317 {
2318 IntPtr sGeomIsIn = d.GeomGetSpace(geom);
2319 if (sGeomIsIn != IntPtr.Zero)
2320 {
2321 if (d.GeomIsSpace(currentspace))
2322 {
2323 waitForSpaceUnlock(sGeomIsIn);
2324 d.SpaceRemove(sGeomIsIn, geom);
2325 }
2326 else
2327 {
2328 m_log.Info("[Physics]: Invalid Scene passed to 'recalculatespace':" +
2329 sGeomIsIn + " Geom:" + geom);
2330 }
2331 }
2332 }
2333
2334 //If there are no more geometries in the sub-space, we don't need it in the main space anymore
2335 if (d.SpaceGetNumGeoms(currentspace) == 0)
2336 {
2337 if (currentspace != IntPtr.Zero)
2338 {
2339 if (d.GeomIsSpace(currentspace))
2340 {
2341 waitForSpaceUnlock(currentspace);
2342 waitForSpaceUnlock(space);
2343 d.SpaceRemove(space, currentspace);
2344 // free up memory used by the space.
2345
2346 //d.SpaceDestroy(currentspace);
2347 resetSpaceArrayItemToZero(currentspace);
2348 }
2349 else
2350 {
2351 m_log.Info("[Physics]: Invalid Scene passed to 'recalculatespace':" +
2352 currentspace + " Geom:" + geom);
2353 }
2354 }
2355 }
2356 }
2357 else
2358 {
2359 // this is a physical object that got disabled. ;.;
2360 if (currentspace != IntPtr.Zero && geom != IntPtr.Zero)
2361 {
2362 if (d.SpaceQuery(currentspace, geom))
2363 {
2364 if (d.GeomIsSpace(currentspace))
2365 {
2366 waitForSpaceUnlock(currentspace);
2367 d.SpaceRemove(currentspace, geom);
2368 }
2369 else
2370 {
2371 m_log.Info("[Physics]: Invalid Scene passed to 'recalculatespace':" +
2372 currentspace + " Geom:" + geom);
2373 }
2374 }
2375 else
2376 {
2377 IntPtr sGeomIsIn = d.GeomGetSpace(geom);
2378 if (sGeomIsIn != IntPtr.Zero)
2379 {
2380 if (d.GeomIsSpace(sGeomIsIn))
2381 {
2382 waitForSpaceUnlock(sGeomIsIn);
2383 d.SpaceRemove(sGeomIsIn, geom);
2384 }
2385 else
2386 {
2387 m_log.Info("[Physics]: Invalid Scene passed to 'recalculatespace':" +
2388 sGeomIsIn + " Geom:" + geom);
2389 }
2390 }
2391 }
2392 }
2393 }
2394
2395 // The routines in the Position and Size sections do the 'inserting' into the space,
2396 // so all we have to do is make sure that the space that we're putting the prim into
2397 // is in the 'main' space.
2398 int[] iprimspaceArrItem = calculateSpaceArrayItemFromPos(pos);
2399 IntPtr newspace = calculateSpaceForGeom(pos);
2400
2401 if (newspace == IntPtr.Zero)
2402 {
2403 newspace = createprimspace(iprimspaceArrItem[0], iprimspaceArrItem[1]);
2404 d.HashSpaceSetLevels(newspace, smallHashspaceLow, smallHashspaceHigh);
2405 }
2406
2407 return newspace;
2408 }
2409
2410 /// <summary>
2411 /// Creates a new space at X Y
2412 /// </summary>
2413 /// <param name="iprimspaceArrItemX"></param>
2414 /// <param name="iprimspaceArrItemY"></param>
2415 /// <returns>A pointer to the created space</returns>
2416 public IntPtr createprimspace(int iprimspaceArrItemX, int iprimspaceArrItemY)
2417 {
2418 // creating a new space for prim and inserting it into main space.
2419 staticPrimspace[iprimspaceArrItemX, iprimspaceArrItemY] = d.HashSpaceCreate(IntPtr.Zero);
2420 d.GeomSetCategoryBits(staticPrimspace[iprimspaceArrItemX, iprimspaceArrItemY], (int)CollisionCategories.Space);
2421 waitForSpaceUnlock(space);
2422 d.SpaceSetSublevel(space, 1);
2423 d.SpaceAdd(space, staticPrimspace[iprimspaceArrItemX, iprimspaceArrItemY]);
2424 return staticPrimspace[iprimspaceArrItemX, iprimspaceArrItemY];
2425 }
2426
2427 /// <summary>
2428 /// Calculates the space the prim should be in by its position
2429 /// </summary>
2430 /// <param name="pos"></param>
2431 /// <returns>a pointer to the space. This could be a new space or reused space.</returns>
2432 public IntPtr calculateSpaceForGeom(Vector3 pos)
2433 {
2434 int[] xyspace = calculateSpaceArrayItemFromPos(pos);
2435 //m_log.Info("[Physics]: Attempting to use arrayItem: " + xyspace[0].ToString() + "," + xyspace[1].ToString());
2436 return staticPrimspace[xyspace[0], xyspace[1]];
2437 }
2438
2439 /// <summary>
2440 /// Holds the space allocation logic
2441 /// </summary>
2442 /// <param name="pos"></param>
2443 /// <returns>an array item based on the position</returns>
2444 public int[] calculateSpaceArrayItemFromPos(Vector3 pos)
2445 {
2446 int[] returnint = new int[2];
2447
2448 returnint[0] = (int) (pos.X/metersInSpace);
2449
2450 if (returnint[0] > ((int) (259f/metersInSpace)))
2451 returnint[0] = ((int) (259f/metersInSpace));
2452 if (returnint[0] < 0)
2453 returnint[0] = 0;
2454
2455 returnint[1] = (int) (pos.Y/metersInSpace);
2456 if (returnint[1] > ((int) (259f/metersInSpace)))
2457 returnint[1] = ((int) (259f/metersInSpace));
2458 if (returnint[1] < 0)
2459 returnint[1] = 0;
2460
2461 return returnint;
2462 }
2463
2464 #endregion
2465
2466 /// <summary>
2467 /// Routine to figure out if we need to mesh this prim with our mesher
2468 /// </summary>
2469 /// <param name="pbs"></param>
2470 /// <returns></returns>
2471 public bool needsMeshing(PrimitiveBaseShape pbs)
2472 {
2473 // most of this is redundant now as the mesher will return null if it cant mesh a prim
2474 // but we still need to check for sculptie meshing being enabled so this is the most
2475 // convenient place to do it for now...
2476
2477 // //if (pbs.PathCurve == (byte)Primitive.PathCurve.Circle && pbs.ProfileCurve == (byte)Primitive.ProfileCurve.Circle && pbs.PathScaleY <= 0.75f)
2478 // //m_log.Debug("needsMeshing: " + " pathCurve: " + pbs.PathCurve.ToString() + " profileCurve: " + pbs.ProfileCurve.ToString() + " pathScaleY: " + Primitive.UnpackPathScale(pbs.PathScaleY).ToString());
2479 int iPropertiesNotSupportedDefault = 0;
2480
2481 if (pbs.SculptEntry && !meshSculptedPrim)
2482 {
2483#if SPAM
2484 m_log.Warn("NonMesh");
2485#endif
2486 return false;
2487 }
2488
2489 // if it's a standard box or sphere with no cuts, hollows, twist or top shear, return false since ODE can use an internal representation for the prim
2490 if (!forceSimplePrimMeshing)
2491 {
2492 if ((pbs.ProfileShape == ProfileShape.Square && pbs.PathCurve == (byte)Extrusion.Straight)
2493 || (pbs.ProfileShape == ProfileShape.HalfCircle && pbs.PathCurve == (byte)Extrusion.Curve1
2494 && pbs.Scale.X == pbs.Scale.Y && pbs.Scale.Y == pbs.Scale.Z))
2495 {
2496
2497 if (pbs.ProfileBegin == 0 && pbs.ProfileEnd == 0
2498 && pbs.ProfileHollow == 0
2499 && pbs.PathTwist == 0 && pbs.PathTwistBegin == 0
2500 && pbs.PathBegin == 0 && pbs.PathEnd == 0
2501 && pbs.PathTaperX == 0 && pbs.PathTaperY == 0
2502 && pbs.PathScaleX == 100 && pbs.PathScaleY == 100
2503 && pbs.PathShearX == 0 && pbs.PathShearY == 0)
2504 {
2505#if SPAM
2506 m_log.Warn("NonMesh");
2507#endif
2508 return false;
2509 }
2510 }
2511 }
2512
2513 if (pbs.ProfileHollow != 0)
2514 iPropertiesNotSupportedDefault++;
2515
2516 if ((pbs.PathTwistBegin != 0) || (pbs.PathTwist != 0))
2517 iPropertiesNotSupportedDefault++;
2518
2519 if ((pbs.ProfileBegin != 0) || pbs.ProfileEnd != 0)
2520 iPropertiesNotSupportedDefault++;
2521
2522 if ((pbs.PathScaleX != 100) || (pbs.PathScaleY != 100))
2523 iPropertiesNotSupportedDefault++;
2524
2525 if ((pbs.PathShearX != 0) || (pbs.PathShearY != 0))
2526 iPropertiesNotSupportedDefault++;
2527
2528 if (pbs.ProfileShape == ProfileShape.Circle && pbs.PathCurve == (byte)Extrusion.Straight)
2529 iPropertiesNotSupportedDefault++;
2530
2531 if (pbs.ProfileShape == ProfileShape.HalfCircle && pbs.PathCurve == (byte)Extrusion.Curve1 && (pbs.Scale.X != pbs.Scale.Y || pbs.Scale.Y != pbs.Scale.Z || pbs.Scale.Z != pbs.Scale.X))
2532 iPropertiesNotSupportedDefault++;
2533
2534 if (pbs.ProfileShape == ProfileShape.HalfCircle && pbs.PathCurve == (byte) Extrusion.Curve1)
2535 iPropertiesNotSupportedDefault++;
2536
2537 // test for torus
2538 if ((pbs.ProfileCurve & 0x07) == (byte)ProfileShape.Square)
2539 {
2540 if (pbs.PathCurve == (byte)Extrusion.Curve1)
2541 {
2542 iPropertiesNotSupportedDefault++;
2543 }
2544 }
2545 else if ((pbs.ProfileCurve & 0x07) == (byte)ProfileShape.Circle)
2546 {
2547 if (pbs.PathCurve == (byte)Extrusion.Straight)
2548 {
2549 iPropertiesNotSupportedDefault++;
2550 }
2551
2552 // ProfileCurve seems to combine hole shape and profile curve so we need to only compare against the lower 3 bits
2553 else if (pbs.PathCurve == (byte)Extrusion.Curve1)
2554 {
2555 iPropertiesNotSupportedDefault++;
2556 }
2557 }
2558 else if ((pbs.ProfileCurve & 0x07) == (byte)ProfileShape.HalfCircle)
2559 {
2560 if (pbs.PathCurve == (byte)Extrusion.Curve1 || pbs.PathCurve == (byte)Extrusion.Curve2)
2561 {
2562 iPropertiesNotSupportedDefault++;
2563 }
2564 }
2565 else if ((pbs.ProfileCurve & 0x07) == (byte)ProfileShape.EquilateralTriangle)
2566 {
2567 if (pbs.PathCurve == (byte)Extrusion.Straight)
2568 {
2569 iPropertiesNotSupportedDefault++;
2570 }
2571 else if (pbs.PathCurve == (byte)Extrusion.Curve1)
2572 {
2573 iPropertiesNotSupportedDefault++;
2574 }
2575 }
2576
2577
2578 if (iPropertiesNotSupportedDefault == 0)
2579 {
2580#if SPAM
2581 m_log.Warn("NonMesh");
2582#endif
2583 return false;
2584 }
2585#if SPAM
2586 m_log.Debug("Mesh");
2587#endif
2588 return true;
2589 }
2590
2591 /// <summary>
2592 /// Called after our prim properties are set Scale, position etc.
2593 /// We use this event queue like method to keep changes to the physical scene occuring in the threadlocked mutex
2594 /// This assures us that we have no race conditions
2595 /// </summary>
2596 /// <param name="prim"></param>
2597 public override void AddPhysicsActorTaint(PhysicsActor prim)
2598 {
2599
2600 if (prim is OdePrim)
2601 {
2602 OdePrim taintedprim = ((OdePrim) prim);
2603 lock (_taintedPrimLock)
2604 {
2605 if (!(_taintedPrimH.Contains(taintedprim)))
2606 {
2607//Console.WriteLine("AddPhysicsActorTaint to " + taintedprim.m_primName);
2608 _taintedPrimH.Add(taintedprim); // HashSet for searching
2609 _taintedPrimL.Add(taintedprim); // List for ordered readout
2610 }
2611 }
2612 return;
2613 }
2614 else if (prim is OdeCharacter)
2615 {
2616 OdeCharacter taintedchar = ((OdeCharacter)prim);
2617 lock (_taintedActors)
2618 {
2619 if (!(_taintedActors.Contains(taintedchar)))
2620 {
2621 _taintedActors.Add(taintedchar);
2622 if (taintedchar.bad)
2623 m_log.DebugFormat("[PHYSICS]: Added BAD actor {0} to tainted actors", taintedchar.m_uuid);
2624 }
2625 }
2626 }
2627 }
2628
2629 /// <summary>
2630 /// This is our main simulate loop
2631 /// It's thread locked by a Mutex in the scene.
2632 /// It holds Collisions, it instructs ODE to step through the physical reactions
2633 /// It moves the objects around in memory
2634 /// It calls the methods that report back to the object owners.. (scenepresence, SceneObjectGroup)
2635 /// </summary>
2636 /// <param name="timeStep"></param>
2637 /// <returns></returns>
2638 public override float Simulate(float timeStep)
2639 {
2640 if (framecount >= int.MaxValue)
2641 framecount = 0;
2642 //if (m_worldOffset != Vector3.Zero)
2643 // return 0;
2644
2645 framecount++;
2646
2647 DateTime now = DateTime.UtcNow;
2648 TimeSpan SinceLastFrame = now - m_lastframe;
2649 m_lastframe = now;
2650 float realtime = (float)SinceLastFrame.TotalSeconds;
2651// Console.WriteLine("ts={0} rt={1}", timeStep, realtime);
2652 timeStep = realtime;
2653
2654 // float fps = 1.0f / realtime;
2655 float fps = 0.0f; // number of ODE steps in this Simulate step
2656 //m_log.Info(timeStep.ToString());
2657 step_time += timeStep;
2658
2659 // If We're loaded down by something else,
2660 // or debugging with the Visual Studio project on pause
2661 // skip a few frames to catch up gracefully.
2662 // without shooting the physicsactors all over the place
2663
2664 if (step_time >= m_SkipFramesAtms)
2665 {
2666 // Instead of trying to catch up, it'll do 5 physics frames only
2667 step_time = ODE_STEPSIZE;
2668 m_physicsiterations = 5;
2669 }
2670 else
2671 {
2672 m_physicsiterations = 10;
2673 }
2674
2675 if (SupportsNINJAJoints)
2676 {
2677 DeleteRequestedJoints(); // this must be outside of the lock (OdeLock) to avoid deadlocks
2678 CreateRequestedJoints(); // this must be outside of the lock (OdeLock) to avoid deadlocks
2679 }
2680
2681 lock (OdeLock)
2682 {
2683 // Process 10 frames if the sim is running normal..
2684 // process 5 frames if the sim is running slow
2685 //try
2686 //{
2687 //d.WorldSetQuickStepNumIterations(world, m_physicsiterations);
2688 //}
2689 //catch (StackOverflowException)
2690 //{
2691 // m_log.Error("[PHYSICS]: The operating system wasn't able to allocate enough memory for the simulation. Restarting the sim.");
2692 // ode.drelease(world);
2693 //base.TriggerPhysicsBasedRestart();
2694 //}
2695
2696 int i = 0;
2697
2698 // Figure out the Frames Per Second we're going at.
2699 //(step_time == 0.004f, there's 250 of those per second. Times the step time/step size
2700
2701 // fps = (step_time / ODE_STEPSIZE) * 1000;
2702 // HACK: Using a time dilation of 1.0 to debug rubberbanding issues
2703 //m_timeDilation = Math.Min((step_time / ODE_STEPSIZE) / (0.09375f / ODE_STEPSIZE), 1.0f);
2704
2705 // step_time = 0.09375f;
2706
2707 while (step_time > 0.0f)
2708 {
2709 //lock (ode)
2710 //{
2711 //if (!ode.lockquery())
2712 //{
2713 // ode.dlock(world);
2714 try
2715 {
2716 // Insert, remove Characters
2717 bool processedtaints = false;
2718
2719 lock (_taintedActors)
2720 {
2721 if (_taintedActors.Count > 0)
2722 {
2723 foreach (OdeCharacter character in _taintedActors)
2724 {
2725
2726 character.ProcessTaints(ODE_STEPSIZE);
2727
2728 processedtaints = true;
2729 //character.m_collisionscore = 0;
2730 }
2731
2732 if (processedtaints)
2733 _taintedActors.Clear();
2734 }
2735 } // end lock _taintedActors
2736
2737 // Modify other objects in the scene.
2738 processedtaints = false;
2739
2740 lock (_taintedPrimLock)
2741 {
2742 foreach (OdePrim prim in _taintedPrimL)
2743 {
2744 if (prim.m_taintremove)
2745 {
2746 //Console.WriteLine("Simulate calls RemovePrimThreadLocked");
2747 RemovePrimThreadLocked(prim);
2748 }
2749 else
2750 {
2751 //Console.WriteLine("Simulate calls ProcessTaints");
2752 prim.ProcessTaints(ODE_STEPSIZE);
2753 }
2754 processedtaints = true;
2755 prim.m_collisionscore = 0;
2756
2757 // This loop can block up the Heartbeat for a very long time on large regions.
2758 // We need to let the Watchdog know that the Heartbeat is not dead
2759 // NOTE: This is currently commented out, but if things like OAR loading are
2760 // timing the heartbeat out we will need to uncomment it
2761 //Watchdog.UpdateThread();
2762 }
2763
2764 if (SupportsNINJAJoints)
2765 {
2766 // Create pending joints, if possible
2767
2768 // joints can only be processed after ALL bodies are processed (and exist in ODE), since creating
2769 // a joint requires specifying the body id of both involved bodies
2770 if (pendingJoints.Count > 0)
2771 {
2772 List<PhysicsJoint> successfullyProcessedPendingJoints = new List<PhysicsJoint>();
2773 //DoJointErrorMessage(joints_connecting_actor, "taint: " + pendingJoints.Count + " pending joints");
2774 foreach (PhysicsJoint joint in pendingJoints)
2775 {
2776 //DoJointErrorMessage(joint, "taint: time to create joint with parms: " + joint.RawParams);
2777 string[] jointParams = joint.RawParams.Split(" ".ToCharArray(),
2778 System.StringSplitOptions.RemoveEmptyEntries);
2779 List<IntPtr> jointBodies = new List<IntPtr>();
2780 bool allJointBodiesAreReady = true;
2781 foreach (string jointParam in jointParams)
2782 {
2783 if (jointParam == "NULL")
2784 {
2785 //DoJointErrorMessage(joint, "attaching NULL joint to world");
2786 jointBodies.Add(IntPtr.Zero);
2787 }
2788 else
2789 {
2790 //DoJointErrorMessage(joint, "looking for prim name: " + jointParam);
2791 bool foundPrim = false;
2792 lock (_prims)
2793 {
2794 foreach (OdePrim prim in _prims) // FIXME: inefficient
2795 {
2796 if (prim.SOPName == jointParam)
2797 {
2798 //DoJointErrorMessage(joint, "found for prim name: " + jointParam);
2799 if (prim.IsPhysical && prim.Body != IntPtr.Zero)
2800 {
2801 jointBodies.Add(prim.Body);
2802 foundPrim = true;
2803 break;
2804 }
2805 else
2806 {
2807 DoJointErrorMessage(joint, "prim name " + jointParam +
2808 " exists but is not (yet) physical; deferring joint creation. " +
2809 "IsPhysical property is " + prim.IsPhysical +
2810 " and body is " + prim.Body);
2811 foundPrim = false;
2812 break;
2813 }
2814 }
2815 }
2816 }
2817 if (foundPrim)
2818 {
2819 // all is fine
2820 }
2821 else
2822 {
2823 allJointBodiesAreReady = false;
2824 break;
2825 }
2826 }
2827 }
2828 if (allJointBodiesAreReady)
2829 {
2830 //DoJointErrorMessage(joint, "allJointBodiesAreReady for " + joint.ObjectNameInScene + " with parms " + joint.RawParams);
2831 if (jointBodies[0] == jointBodies[1])
2832 {
2833 DoJointErrorMessage(joint, "ERROR: joint cannot be created; the joint bodies are the same, body1==body2. Raw body is " + jointBodies[0] + ". raw parms: " + joint.RawParams);
2834 }
2835 else
2836 {
2837 switch (joint.Type)
2838 {
2839 case PhysicsJointType.Ball:
2840 {
2841 IntPtr odeJoint;
2842 //DoJointErrorMessage(joint, "ODE creating ball joint ");
2843 odeJoint = d.JointCreateBall(world, IntPtr.Zero);
2844 //DoJointErrorMessage(joint, "ODE attaching ball joint: " + odeJoint + " with b1:" + jointBodies[0] + " b2:" + jointBodies[1]);
2845 d.JointAttach(odeJoint, jointBodies[0], jointBodies[1]);
2846 //DoJointErrorMessage(joint, "ODE setting ball anchor: " + odeJoint + " to vec:" + joint.Position);
2847 d.JointSetBallAnchor(odeJoint,
2848 joint.Position.X,
2849 joint.Position.Y,
2850 joint.Position.Z);
2851 //DoJointErrorMessage(joint, "ODE joint setting OK");
2852 //DoJointErrorMessage(joint, "The ball joint's bodies are here: b0: ");
2853 //DoJointErrorMessage(joint, "" + (jointBodies[0] != IntPtr.Zero ? "" + d.BodyGetPosition(jointBodies[0]) : "fixed environment"));
2854 //DoJointErrorMessage(joint, "The ball joint's bodies are here: b1: ");
2855 //DoJointErrorMessage(joint, "" + (jointBodies[1] != IntPtr.Zero ? "" + d.BodyGetPosition(jointBodies[1]) : "fixed environment"));
2856
2857 if (joint is OdePhysicsJoint)
2858 {
2859 ((OdePhysicsJoint)joint).jointID = odeJoint;
2860 }
2861 else
2862 {
2863 DoJointErrorMessage(joint, "WARNING: non-ode joint in ODE!");
2864 }
2865 }
2866 break;
2867 case PhysicsJointType.Hinge:
2868 {
2869 IntPtr odeJoint;
2870 //DoJointErrorMessage(joint, "ODE creating hinge joint ");
2871 odeJoint = d.JointCreateHinge(world, IntPtr.Zero);
2872 //DoJointErrorMessage(joint, "ODE attaching hinge joint: " + odeJoint + " with b1:" + jointBodies[0] + " b2:" + jointBodies[1]);
2873 d.JointAttach(odeJoint, jointBodies[0], jointBodies[1]);
2874 //DoJointErrorMessage(joint, "ODE setting hinge anchor: " + odeJoint + " to vec:" + joint.Position);
2875 d.JointSetHingeAnchor(odeJoint,
2876 joint.Position.X,
2877 joint.Position.Y,
2878 joint.Position.Z);
2879 // We use the orientation of the x-axis of the joint's coordinate frame
2880 // as the axis for the hinge.
2881
2882 // Therefore, we must get the joint's coordinate frame based on the
2883 // joint.Rotation field, which originates from the orientation of the
2884 // joint's proxy object in the scene.
2885
2886 // The joint's coordinate frame is defined as the transformation matrix
2887 // that converts a vector from joint-local coordinates into world coordinates.
2888 // World coordinates are defined as the XYZ coordinate system of the sim,
2889 // as shown in the top status-bar of the viewer.
2890
2891 // Once we have the joint's coordinate frame, we extract its X axis (AtAxis)
2892 // and use that as the hinge axis.
2893
2894 //joint.Rotation.Normalize();
2895 Matrix4 proxyFrame = Matrix4.CreateFromQuaternion(joint.Rotation);
2896
2897 // Now extract the X axis of the joint's coordinate frame.
2898
2899 // Do not try to use proxyFrame.AtAxis or you will become mired in the
2900 // tar pit of transposed, inverted, and generally messed-up orientations.
2901 // (In other words, Matrix4.AtAxis() is borked.)
2902 // Vector3 jointAxis = proxyFrame.AtAxis; <--- this path leadeth to madness
2903
2904 // Instead, compute the X axis of the coordinate frame by transforming
2905 // the (1,0,0) vector. At least that works.
2906
2907 //m_log.Debug("PHY: making axis: complete matrix is " + proxyFrame);
2908 Vector3 jointAxis = Vector3.Transform(Vector3.UnitX, proxyFrame);
2909 //m_log.Debug("PHY: making axis: hinge joint axis is " + jointAxis);
2910 //DoJointErrorMessage(joint, "ODE setting hinge axis: " + odeJoint + " to vec:" + jointAxis);
2911 d.JointSetHingeAxis(odeJoint,
2912 jointAxis.X,
2913 jointAxis.Y,
2914 jointAxis.Z);
2915 //d.JointSetHingeParam(odeJoint, (int)dParam.CFM, 0.1f);
2916 if (joint is OdePhysicsJoint)
2917 {
2918 ((OdePhysicsJoint)joint).jointID = odeJoint;
2919 }
2920 else
2921 {
2922 DoJointErrorMessage(joint, "WARNING: non-ode joint in ODE!");
2923 }
2924 }
2925 break;
2926 }
2927 successfullyProcessedPendingJoints.Add(joint);
2928 }
2929 }
2930 else
2931 {
2932 DoJointErrorMessage(joint, "joint could not yet be created; still pending");
2933 }
2934 }
2935 foreach (PhysicsJoint successfullyProcessedJoint in successfullyProcessedPendingJoints)
2936 {
2937 //DoJointErrorMessage(successfullyProcessedJoint, "finalizing succesfully procsssed joint " + successfullyProcessedJoint.ObjectNameInScene + " parms " + successfullyProcessedJoint.RawParams);
2938 //DoJointErrorMessage(successfullyProcessedJoint, "removing from pending");
2939 InternalRemovePendingJoint(successfullyProcessedJoint);
2940 //DoJointErrorMessage(successfullyProcessedJoint, "adding to active");
2941 InternalAddActiveJoint(successfullyProcessedJoint);
2942 //DoJointErrorMessage(successfullyProcessedJoint, "done");
2943 }
2944 }
2945 } // end SupportsNINJAJoints
2946
2947 if (processedtaints)
2948//Console.WriteLine("Simulate calls Clear of _taintedPrim list");
2949 _taintedPrimH.Clear(); // ??? if this only ???
2950 _taintedPrimL.Clear();
2951 } // end lock _taintedPrimLock
2952
2953 // Move characters
2954 lock (_characters)
2955 {
2956 List<OdeCharacter> defects = new List<OdeCharacter>();
2957 foreach (OdeCharacter actor in _characters)
2958 {
2959 if (actor != null)
2960 actor.Move(ODE_STEPSIZE, defects);
2961 }
2962 if (0 != defects.Count)
2963 {
2964 foreach (OdeCharacter defect in defects)
2965 {
2966 RemoveCharacter(defect);
2967 }
2968 }
2969 } // end lock _characters
2970
2971 // Move other active objects
2972 lock (_activeprims)
2973 {
2974 foreach (OdePrim prim in _activeprims)
2975 {
2976 prim.m_collisionscore = 0;
2977 prim.Move(ODE_STEPSIZE);
2978 }
2979 } // end lock _activeprims
2980
2981 //if ((framecount % m_randomizeWater) == 0)
2982 // randomizeWater(waterlevel);
2983
2984 //int RayCastTimeMS = m_rayCastManager.ProcessQueuedRequests();
2985 m_rayCastManager.ProcessQueuedRequests();
2986
2987 collision_optimized(ODE_STEPSIZE);
2988
2989 lock (_collisionEventPrim)
2990 {
2991 foreach (PhysicsActor obj in _collisionEventPrim)
2992 {
2993 if (obj == null)
2994 continue;
2995
2996 switch ((ActorTypes)obj.PhysicsActorType)
2997 {
2998 case ActorTypes.Agent:
2999 OdeCharacter cobj = (OdeCharacter)obj;
3000 cobj.AddCollisionFrameTime(100);
3001 cobj.SendCollisions();
3002 break;
3003 case ActorTypes.Prim:
3004 OdePrim pobj = (OdePrim)obj;
3005 pobj.SendCollisions();
3006 break;
3007 }
3008 }
3009 } // end lock _collisionEventPrim
3010
3011 //if (m_global_contactcount > 5)
3012 //{
3013 // m_log.DebugFormat("[PHYSICS]: Contacts:{0}", m_global_contactcount);
3014 //}
3015
3016 m_global_contactcount = 0;
3017
3018 d.WorldQuickStep(world, ODE_STEPSIZE);
3019 d.JointGroupEmpty(contactgroup);
3020 fps++;
3021 //ode.dunlock(world);
3022 } // end try
3023 catch (Exception e)
3024 {
3025 m_log.ErrorFormat("[PHYSICS]: {0}, {1}, {2}", e.Message, e.TargetSite, e);
3026 ode.dunlock(world);
3027 }
3028
3029 step_time -= ODE_STEPSIZE;
3030 i++;
3031 //}
3032 //else
3033 //{
3034 //fps = 0;
3035 //}
3036 //}
3037 } // end while (step_time > 0.0f)
3038
3039 lock (_characters)
3040 {
3041 foreach (OdeCharacter actor in _characters)
3042 {
3043 if (actor != null)
3044 {
3045 if (actor.bad)
3046 m_log.WarnFormat("[PHYSICS]: BAD Actor {0} in _characters list was not removed?", actor.m_uuid);
3047 actor.UpdatePositionAndVelocity();
3048 }
3049 }
3050 }
3051
3052 lock (_badCharacter)
3053 {
3054 if (_badCharacter.Count > 0)
3055 {
3056 foreach (OdeCharacter chr in _badCharacter)
3057 {
3058 RemoveCharacter(chr);
3059 }
3060 _badCharacter.Clear();
3061 }
3062 }
3063
3064 lock (_activeprims)
3065 {
3066 //if (timeStep < 0.2f)
3067 {
3068 foreach (OdePrim actor in _activeprims)
3069 {
3070 if (actor.IsPhysical && (d.BodyIsEnabled(actor.Body) || !actor._zeroFlag))
3071 {
3072 actor.UpdatePositionAndVelocity();
3073
3074 if (SupportsNINJAJoints)
3075 {
3076 // If an actor moved, move its joint proxy objects as well.
3077 // There seems to be an event PhysicsActor.OnPositionUpdate that could be used
3078 // for this purpose but it is never called! So we just do the joint
3079 // movement code here.
3080
3081 if (actor.SOPName != null &&
3082 joints_connecting_actor.ContainsKey(actor.SOPName) &&
3083 joints_connecting_actor[actor.SOPName] != null &&
3084 joints_connecting_actor[actor.SOPName].Count > 0)
3085 {
3086 foreach (PhysicsJoint affectedJoint in joints_connecting_actor[actor.SOPName])
3087 {
3088 if (affectedJoint.IsInPhysicsEngine)
3089 {
3090 DoJointMoved(affectedJoint);
3091 }
3092 else
3093 {
3094 DoJointErrorMessage(affectedJoint, "a body connected to a joint was moved, but the joint doesn't exist yet! this will lead to joint error. joint was: " + affectedJoint.ObjectNameInScene + " parms:" + affectedJoint.RawParams);
3095 }
3096 }
3097 }
3098 }
3099 }
3100 }
3101 }
3102 } // end lock _activeprims
3103
3104 //DumpJointInfo();
3105
3106 // Finished with all sim stepping. If requested, dump world state to file for debugging.
3107 // TODO: This call to the export function is already inside lock (OdeLock) - but is an extra lock needed?
3108 // TODO: This overwrites all dump files in-place. Should this be a growing logfile, or separate snapshots?
3109 if (physics_logging && (physics_logging_interval>0) && (framecount % physics_logging_interval == 0))
3110 {
3111 string fname = "state-" + world.ToString() + ".DIF"; // give each physics world a separate filename
3112 string prefix = "world" + world.ToString(); // prefix for variable names in exported .DIF file
3113
3114 if (physics_logging_append_existing_logfile)
3115 {
3116 string header = "-------------- START OF PHYSICS FRAME " + framecount.ToString() + " --------------";
3117 TextWriter fwriter = File.AppendText(fname);
3118 fwriter.WriteLine(header);
3119 fwriter.Close();
3120 }
3121 d.WorldExportDIF(world, fname, physics_logging_append_existing_logfile, prefix);
3122 }
3123 } // end lock OdeLock
3124
3125 return fps * 1000.0f; //NB This is a FRAME COUNT, not a time! AND is divide by 1000 in SimStatusReporter!
3126 } // end Simulate
3127
3128 public override void GetResults()
3129 {
3130 }
3131
3132 public override bool IsThreaded
3133 {
3134 // for now we won't be multithreaded
3135 get { return (false); }
3136 }
3137
3138 #region ODE Specific Terrain Fixes
3139 public float[] ResizeTerrain512NearestNeighbour(float[] heightMap)
3140 {
3141 float[] returnarr = new float[262144];
3142 float[,] resultarr = new float[(int)WorldExtents.X, (int)WorldExtents.Y];
3143
3144 // Filling out the array into its multi-dimensional components
3145 for (int y = 0; y < WorldExtents.Y; y++)
3146 {
3147 for (int x = 0; x < WorldExtents.X; x++)
3148 {
3149 resultarr[y, x] = heightMap[y * (int)WorldExtents.Y + x];
3150 }
3151 }
3152
3153 // Resize using Nearest Neighbour
3154
3155 // This particular way is quick but it only works on a multiple of the original
3156
3157 // The idea behind this method can be described with the following diagrams
3158 // second pass and third pass happen in the same loop really.. just separated
3159 // them to show what this does.
3160
3161 // First Pass
3162 // ResultArr:
3163 // 1,1,1,1,1,1
3164 // 1,1,1,1,1,1
3165 // 1,1,1,1,1,1
3166 // 1,1,1,1,1,1
3167 // 1,1,1,1,1,1
3168 // 1,1,1,1,1,1
3169
3170 // Second Pass
3171 // ResultArr2:
3172 // 1,,1,,1,,1,,1,,1,
3173 // ,,,,,,,,,,
3174 // 1,,1,,1,,1,,1,,1,
3175 // ,,,,,,,,,,
3176 // 1,,1,,1,,1,,1,,1,
3177 // ,,,,,,,,,,
3178 // 1,,1,,1,,1,,1,,1,
3179 // ,,,,,,,,,,
3180 // 1,,1,,1,,1,,1,,1,
3181 // ,,,,,,,,,,
3182 // 1,,1,,1,,1,,1,,1,
3183
3184 // Third pass fills in the blanks
3185 // ResultArr2:
3186 // 1,1,1,1,1,1,1,1,1,1,1,1
3187 // 1,1,1,1,1,1,1,1,1,1,1,1
3188 // 1,1,1,1,1,1,1,1,1,1,1,1
3189 // 1,1,1,1,1,1,1,1,1,1,1,1
3190 // 1,1,1,1,1,1,1,1,1,1,1,1
3191 // 1,1,1,1,1,1,1,1,1,1,1,1
3192 // 1,1,1,1,1,1,1,1,1,1,1,1
3193 // 1,1,1,1,1,1,1,1,1,1,1,1
3194 // 1,1,1,1,1,1,1,1,1,1,1,1
3195 // 1,1,1,1,1,1,1,1,1,1,1,1
3196 // 1,1,1,1,1,1,1,1,1,1,1,1
3197
3198 // X,Y = .
3199 // X+1,y = ^
3200 // X,Y+1 = *
3201 // X+1,Y+1 = #
3202
3203 // Filling in like this;
3204 // .*
3205 // ^#
3206 // 1st .
3207 // 2nd *
3208 // 3rd ^
3209 // 4th #
3210 // on single loop.
3211
3212 float[,] resultarr2 = new float[512, 512];
3213 for (int y = 0; y < WorldExtents.Y; y++)
3214 {
3215 for (int x = 0; x < WorldExtents.X; x++)
3216 {
3217 resultarr2[y * 2, x * 2] = resultarr[y, x];
3218
3219 if (y < WorldExtents.Y)
3220 {
3221 resultarr2[(y * 2) + 1, x * 2] = resultarr[y, x];
3222 }
3223 if (x < WorldExtents.X)
3224 {
3225 resultarr2[y * 2, (x * 2) + 1] = resultarr[y, x];
3226 }
3227 if (x < WorldExtents.X && y < WorldExtents.Y)
3228 {
3229 resultarr2[(y * 2) + 1, (x * 2) + 1] = resultarr[y, x];
3230 }
3231 }
3232 }
3233
3234 //Flatten out the array
3235 int i = 0;
3236 for (int y = 0; y < 512; y++)
3237 {
3238 for (int x = 0; x < 512; x++)
3239 {
3240 if (resultarr2[y, x] <= 0)
3241 returnarr[i] = 0.0000001f;
3242 else
3243 returnarr[i] = resultarr2[y, x];
3244
3245 i++;
3246 }
3247 }
3248
3249 return returnarr;
3250 }
3251
3252 public float[] ResizeTerrain512Interpolation(float[] heightMap)
3253 {
3254 float[] returnarr = new float[262144];
3255 float[,] resultarr = new float[512,512];
3256
3257 // Filling out the array into its multi-dimensional components
3258 for (int y = 0; y < 256; y++)
3259 {
3260 for (int x = 0; x < 256; x++)
3261 {
3262 resultarr[y, x] = heightMap[y * 256 + x];
3263 }
3264 }
3265
3266 // Resize using interpolation
3267
3268 // This particular way is quick but it only works on a multiple of the original
3269
3270 // The idea behind this method can be described with the following diagrams
3271 // second pass and third pass happen in the same loop really.. just separated
3272 // them to show what this does.
3273
3274 // First Pass
3275 // ResultArr:
3276 // 1,1,1,1,1,1
3277 // 1,1,1,1,1,1
3278 // 1,1,1,1,1,1
3279 // 1,1,1,1,1,1
3280 // 1,1,1,1,1,1
3281 // 1,1,1,1,1,1
3282
3283 // Second Pass
3284 // ResultArr2:
3285 // 1,,1,,1,,1,,1,,1,
3286 // ,,,,,,,,,,
3287 // 1,,1,,1,,1,,1,,1,
3288 // ,,,,,,,,,,
3289 // 1,,1,,1,,1,,1,,1,
3290 // ,,,,,,,,,,
3291 // 1,,1,,1,,1,,1,,1,
3292 // ,,,,,,,,,,
3293 // 1,,1,,1,,1,,1,,1,
3294 // ,,,,,,,,,,
3295 // 1,,1,,1,,1,,1,,1,
3296
3297 // Third pass fills in the blanks
3298 // ResultArr2:
3299 // 1,1,1,1,1,1,1,1,1,1,1,1
3300 // 1,1,1,1,1,1,1,1,1,1,1,1
3301 // 1,1,1,1,1,1,1,1,1,1,1,1
3302 // 1,1,1,1,1,1,1,1,1,1,1,1
3303 // 1,1,1,1,1,1,1,1,1,1,1,1
3304 // 1,1,1,1,1,1,1,1,1,1,1,1
3305 // 1,1,1,1,1,1,1,1,1,1,1,1
3306 // 1,1,1,1,1,1,1,1,1,1,1,1
3307 // 1,1,1,1,1,1,1,1,1,1,1,1
3308 // 1,1,1,1,1,1,1,1,1,1,1,1
3309 // 1,1,1,1,1,1,1,1,1,1,1,1
3310
3311 // X,Y = .
3312 // X+1,y = ^
3313 // X,Y+1 = *
3314 // X+1,Y+1 = #
3315
3316 // Filling in like this;
3317 // .*
3318 // ^#
3319 // 1st .
3320 // 2nd *
3321 // 3rd ^
3322 // 4th #
3323 // on single loop.
3324
3325 float[,] resultarr2 = new float[512,512];
3326 for (int y = 0; y < (int)Constants.RegionSize; y++)
3327 {
3328 for (int x = 0; x < (int)Constants.RegionSize; x++)
3329 {
3330 resultarr2[y*2, x*2] = resultarr[y, x];
3331
3332 if (y < (int)Constants.RegionSize)
3333 {
3334 if (y + 1 < (int)Constants.RegionSize)
3335 {
3336 if (x + 1 < (int)Constants.RegionSize)
3337 {
3338 resultarr2[(y*2) + 1, x*2] = ((resultarr[y, x] + resultarr[y + 1, x] +
3339 resultarr[y, x + 1] + resultarr[y + 1, x + 1])/4);
3340 }
3341 else
3342 {
3343 resultarr2[(y*2) + 1, x*2] = ((resultarr[y, x] + resultarr[y + 1, x])/2);
3344 }
3345 }
3346 else
3347 {
3348 resultarr2[(y*2) + 1, x*2] = resultarr[y, x];
3349 }
3350 }
3351 if (x < (int)Constants.RegionSize)
3352 {
3353 if (x + 1 < (int)Constants.RegionSize)
3354 {
3355 if (y + 1 < (int)Constants.RegionSize)
3356 {
3357 resultarr2[y*2, (x*2) + 1] = ((resultarr[y, x] + resultarr[y + 1, x] +
3358 resultarr[y, x + 1] + resultarr[y + 1, x + 1])/4);
3359 }
3360 else
3361 {
3362 resultarr2[y*2, (x*2) + 1] = ((resultarr[y, x] + resultarr[y, x + 1])/2);
3363 }
3364 }
3365 else
3366 {
3367 resultarr2[y*2, (x*2) + 1] = resultarr[y, x];
3368 }
3369 }
3370 if (x < (int)Constants.RegionSize && y < (int)Constants.RegionSize)
3371 {
3372 if ((x + 1 < (int)Constants.RegionSize) && (y + 1 < (int)Constants.RegionSize))
3373 {
3374 resultarr2[(y*2) + 1, (x*2) + 1] = ((resultarr[y, x] + resultarr[y + 1, x] +
3375 resultarr[y, x + 1] + resultarr[y + 1, x + 1])/4);
3376 }
3377 else
3378 {
3379 resultarr2[(y*2) + 1, (x*2) + 1] = resultarr[y, x];
3380 }
3381 }
3382 }
3383 }
3384 //Flatten out the array
3385 int i = 0;
3386 for (int y = 0; y < 512; y++)
3387 {
3388 for (int x = 0; x < 512; x++)
3389 {
3390 if (Single.IsNaN(resultarr2[y, x]) || Single.IsInfinity(resultarr2[y, x]))
3391 {
3392 m_log.Warn("[PHYSICS]: Non finite heightfield element detected. Setting it to 0");
3393 resultarr2[y, x] = 0;
3394 }
3395 returnarr[i] = resultarr2[y, x];
3396 i++;
3397 }
3398 }
3399
3400 return returnarr;
3401 }
3402
3403 #endregion
3404
3405 public override void SetTerrain(float[] heightMap)
3406 {
3407 if (m_worldOffset != Vector3.Zero && m_parentScene != null)
3408 {
3409 if (m_parentScene is OdeScene)
3410 {
3411 ((OdeScene)m_parentScene).SetTerrain(heightMap, m_worldOffset);
3412 }
3413 }
3414 else
3415 {
3416 SetTerrain(heightMap, m_worldOffset);
3417 }
3418 }
3419
3420 public void SetTerrain(float[] heightMap, Vector3 pOffset)
3421 {
3422 // this._heightmap[i] = (double)heightMap[i];
3423 // dbm (danx0r) -- creating a buffer zone of one extra sample all around
3424 //_origheightmap = heightMap;
3425
3426 float[] _heightmap;
3427
3428 // zero out a heightmap array float array (single dimension [flattened]))
3429 //if ((int)Constants.RegionSize == 256)
3430 // _heightmap = new float[514 * 514];
3431 //else
3432
3433 _heightmap = new float[(((int)Constants.RegionSize + 2) * ((int)Constants.RegionSize + 2))];
3434
3435 uint heightmapWidth = Constants.RegionSize + 1;
3436 uint heightmapHeight = Constants.RegionSize + 1;
3437
3438 uint heightmapWidthSamples;
3439
3440 uint heightmapHeightSamples;
3441
3442 //if (((int)Constants.RegionSize) == 256)
3443 //{
3444 // heightmapWidthSamples = 2 * (uint)Constants.RegionSize + 2;
3445 // heightmapHeightSamples = 2 * (uint)Constants.RegionSize + 2;
3446 // heightmapWidth++;
3447 // heightmapHeight++;
3448 //}
3449 //else
3450 //{
3451
3452 heightmapWidthSamples = (uint)Constants.RegionSize + 1;
3453 heightmapHeightSamples = (uint)Constants.RegionSize + 1;
3454 //}
3455
3456 const float scale = 1.0f;
3457 const float offset = 0.0f;
3458 const float thickness = 0.2f;
3459 const int wrap = 0;
3460
3461 int regionsize = (int) Constants.RegionSize + 2;
3462 //Double resolution
3463 //if (((int)Constants.RegionSize) == 256)
3464 // heightMap = ResizeTerrain512Interpolation(heightMap);
3465
3466
3467 // if (((int)Constants.RegionSize) == 256 && (int)Constants.RegionSize == 256)
3468 // regionsize = 512;
3469
3470 float hfmin = 2000;
3471 float hfmax = -2000;
3472
3473 for (int x = 0; x < heightmapWidthSamples; x++)
3474 {
3475 for (int y = 0; y < heightmapHeightSamples; y++)
3476 {
3477 int xx = Util.Clip(x - 1, 0, regionsize - 1);
3478 int yy = Util.Clip(y - 1, 0, regionsize - 1);
3479
3480
3481 float val= heightMap[yy * (int)Constants.RegionSize + xx];
3482 _heightmap[x * ((int)Constants.RegionSize + 2) + y] = val;
3483
3484 hfmin = (val < hfmin) ? val : hfmin;
3485 hfmax = (val > hfmax) ? val : hfmax;
3486 }
3487 }
3488
3489
3490
3491
3492 lock (OdeLock)
3493 {
3494 IntPtr GroundGeom = IntPtr.Zero;
3495 if (RegionTerrain.TryGetValue(pOffset, out GroundGeom))
3496 {
3497 RegionTerrain.Remove(pOffset);
3498 if (GroundGeom != IntPtr.Zero)
3499 {
3500 if (TerrainHeightFieldHeights.ContainsKey(GroundGeom))
3501 {
3502 TerrainHeightFieldHeights.Remove(GroundGeom);
3503 }
3504 d.SpaceRemove(space, GroundGeom);
3505 d.GeomDestroy(GroundGeom);
3506 }
3507
3508 }
3509 IntPtr HeightmapData = d.GeomHeightfieldDataCreate();
3510 d.GeomHeightfieldDataBuildSingle(HeightmapData, _heightmap, 0, heightmapWidth + 1, heightmapHeight + 1,
3511 (int)heightmapWidthSamples + 1, (int)heightmapHeightSamples + 1, scale,
3512 offset, thickness, wrap);
3513 d.GeomHeightfieldDataSetBounds(HeightmapData, hfmin - 1, hfmax + 1);
3514 GroundGeom = d.CreateHeightfield(space, HeightmapData, 1);
3515 if (GroundGeom != IntPtr.Zero)
3516 {
3517 d.GeomSetCategoryBits(GroundGeom, (int)(CollisionCategories.Land));
3518 d.GeomSetCollideBits(GroundGeom, (int)(CollisionCategories.Space));
3519
3520 }
3521 geom_name_map[GroundGeom] = "Terrain";
3522
3523 d.Matrix3 R = new d.Matrix3();
3524
3525 Quaternion q1 = Quaternion.CreateFromAxisAngle(new Vector3(1, 0, 0), 1.5707f);
3526 Quaternion q2 = Quaternion.CreateFromAxisAngle(new Vector3(0, 1, 0), 1.5707f);
3527 //Axiom.Math.Quaternion q3 = Axiom.Math.Quaternion.FromAngleAxis(3.14f, new Axiom.Math.Vector3(0, 0, 1));
3528
3529 q1 = q1 * q2;
3530 //q1 = q1 * q3;
3531 Vector3 v3;
3532 float angle;
3533 q1.GetAxisAngle(out v3, out angle);
3534
3535 d.RFromAxisAndAngle(out R, v3.X, v3.Y, v3.Z, angle);
3536 d.GeomSetRotation(GroundGeom, ref R);
3537 d.GeomSetPosition(GroundGeom, (pOffset.X + ((int)Constants.RegionSize * 0.5f)) - 1, (pOffset.Y + ((int)Constants.RegionSize * 0.5f)) - 1, 0);
3538 IntPtr testGround = IntPtr.Zero;
3539 if (RegionTerrain.TryGetValue(pOffset, out testGround))
3540 {
3541 RegionTerrain.Remove(pOffset);
3542 }
3543 RegionTerrain.Add(pOffset, GroundGeom, GroundGeom);
3544 TerrainHeightFieldHeights.Add(GroundGeom,_heightmap);
3545
3546 }
3547 }
3548
3549 public override void DeleteTerrain()
3550 {
3551 }
3552
3553 public float GetWaterLevel()
3554 {
3555 return waterlevel;
3556 }
3557
3558 public override bool SupportsCombining()
3559 {
3560 return true;
3561 }
3562
3563 public override void UnCombine(PhysicsScene pScene)
3564 {
3565 IntPtr localGround = IntPtr.Zero;
3566// float[] localHeightfield;
3567 bool proceed = false;
3568 List<IntPtr> geomDestroyList = new List<IntPtr>();
3569
3570 lock (OdeLock)
3571 {
3572 if (RegionTerrain.TryGetValue(Vector3.Zero, out localGround))
3573 {
3574 foreach (IntPtr geom in TerrainHeightFieldHeights.Keys)
3575 {
3576 if (geom == localGround)
3577 {
3578// localHeightfield = TerrainHeightFieldHeights[geom];
3579 proceed = true;
3580 }
3581 else
3582 {
3583 geomDestroyList.Add(geom);
3584 }
3585 }
3586
3587 if (proceed)
3588 {
3589 m_worldOffset = Vector3.Zero;
3590 WorldExtents = new Vector2((int)Constants.RegionSize, (int)Constants.RegionSize);
3591 m_parentScene = null;
3592
3593 foreach (IntPtr g in geomDestroyList)
3594 {
3595 // removingHeightField needs to be done or the garbage collector will
3596 // collect the terrain data before we tell ODE to destroy it causing
3597 // memory corruption
3598 if (TerrainHeightFieldHeights.ContainsKey(g))
3599 {
3600// float[] removingHeightField = TerrainHeightFieldHeights[g];
3601 TerrainHeightFieldHeights.Remove(g);
3602
3603 if (RegionTerrain.ContainsKey(g))
3604 {
3605 RegionTerrain.Remove(g);
3606 }
3607
3608 d.GeomDestroy(g);
3609 //removingHeightField = new float[0];
3610 }
3611 }
3612
3613 }
3614 else
3615 {
3616 m_log.Warn("[PHYSICS]: Couldn't proceed with UnCombine. Region has inconsistant data.");
3617
3618 }
3619 }
3620 }
3621 }
3622
3623 public override void SetWaterLevel(float baseheight)
3624 {
3625 waterlevel = baseheight;
3626 randomizeWater(waterlevel);
3627 }
3628
3629 public void randomizeWater(float baseheight)
3630 {
3631 const uint heightmapWidth = m_regionWidth + 2;
3632 const uint heightmapHeight = m_regionHeight + 2;
3633 const uint heightmapWidthSamples = m_regionWidth + 2;
3634 const uint heightmapHeightSamples = m_regionHeight + 2;
3635 const float scale = 1.0f;
3636 const float offset = 0.0f;
3637 const float thickness = 2.9f;
3638 const int wrap = 0;
3639
3640 for (int i = 0; i < (258 * 258); i++)
3641 {
3642 _watermap[i] = (baseheight-0.1f) + ((float)fluidRandomizer.Next(1,9) / 10f);
3643 // m_log.Info((baseheight - 0.1f) + ((float)fluidRandomizer.Next(1, 9) / 10f));
3644 }
3645
3646 lock (OdeLock)
3647 {
3648 if (WaterGeom != IntPtr.Zero)
3649 {
3650 d.SpaceRemove(space, WaterGeom);
3651 }
3652 IntPtr HeightmapData = d.GeomHeightfieldDataCreate();
3653 d.GeomHeightfieldDataBuildSingle(HeightmapData, _watermap, 0, heightmapWidth, heightmapHeight,
3654 (int)heightmapWidthSamples, (int)heightmapHeightSamples, scale,
3655 offset, thickness, wrap);
3656 d.GeomHeightfieldDataSetBounds(HeightmapData, m_regionWidth, m_regionHeight);
3657 WaterGeom = d.CreateHeightfield(space, HeightmapData, 1);
3658 if (WaterGeom != IntPtr.Zero)
3659 {
3660 d.GeomSetCategoryBits(WaterGeom, (int)(CollisionCategories.Water));
3661 d.GeomSetCollideBits(WaterGeom, (int)(CollisionCategories.Space));
3662
3663 }
3664 geom_name_map[WaterGeom] = "Water";
3665
3666 d.Matrix3 R = new d.Matrix3();
3667
3668 Quaternion q1 = Quaternion.CreateFromAxisAngle(new Vector3(1, 0, 0), 1.5707f);
3669 Quaternion q2 = Quaternion.CreateFromAxisAngle(new Vector3(0, 1, 0), 1.5707f);
3670 //Axiom.Math.Quaternion q3 = Axiom.Math.Quaternion.FromAngleAxis(3.14f, new Axiom.Math.Vector3(0, 0, 1));
3671
3672 q1 = q1 * q2;
3673 //q1 = q1 * q3;
3674 Vector3 v3;
3675 float angle;
3676 q1.GetAxisAngle(out v3, out angle);
3677
3678 d.RFromAxisAndAngle(out R, v3.X, v3.Y, v3.Z, angle);
3679 d.GeomSetRotation(WaterGeom, ref R);
3680 d.GeomSetPosition(WaterGeom, 128, 128, 0);
3681
3682 }
3683
3684 }
3685
3686 public override void Dispose()
3687 {
3688 m_rayCastManager.Dispose();
3689 m_rayCastManager = null;
3690
3691 lock (OdeLock)
3692 {
3693 lock (_prims)
3694 {
3695 foreach (OdePrim prm in _prims)
3696 {
3697 RemovePrim(prm);
3698 }
3699 }
3700
3701 //foreach (OdeCharacter act in _characters)
3702 //{
3703 //RemoveAvatar(act);
3704 //}
3705 d.WorldDestroy(world);
3706 //d.CloseODE();
3707 }
3708 }
3709 public override Dictionary<uint, float> GetTopColliders()
3710 {
3711 Dictionary<uint, float> returncolliders = new Dictionary<uint, float>();
3712 int cnt = 0;
3713 lock (_prims)
3714 {
3715 foreach (OdePrim prm in _prims)
3716 {
3717 if (prm.CollisionScore > 0)
3718 {
3719 returncolliders.Add(prm.m_localID, prm.CollisionScore);
3720 cnt++;
3721 prm.CollisionScore = 0f;
3722 if (cnt > 25)
3723 {
3724 break;
3725 }
3726 }
3727 }
3728 }
3729 return returncolliders;
3730 }
3731
3732 public override bool SupportsRayCast()
3733 {
3734 return true;
3735 }
3736
3737 public override void RaycastWorld(Vector3 position, Vector3 direction, float length, RaycastCallback retMethod)
3738 {
3739 if (retMethod != null)
3740 {
3741 m_rayCastManager.QueueRequest(position, direction, length, retMethod);
3742 }
3743 }
3744
3745#if USE_DRAWSTUFF
3746 // Keyboard callback
3747 public void command(int cmd)
3748 {
3749 IntPtr geom;
3750 d.Mass mass;
3751 d.Vector3 sides = new d.Vector3(d.RandReal() * 0.5f + 0.1f, d.RandReal() * 0.5f + 0.1f, d.RandReal() * 0.5f + 0.1f);
3752
3753
3754
3755 Char ch = Char.ToLower((Char)cmd);
3756 switch ((Char)ch)
3757 {
3758 case 'w':
3759 try
3760 {
3761 Vector3 rotate = (new Vector3(1, 0, 0) * Quaternion.CreateFromEulers(hpr.Z * Utils.DEG_TO_RAD, hpr.Y * Utils.DEG_TO_RAD, hpr.X * Utils.DEG_TO_RAD));
3762
3763 xyz.X += rotate.X; xyz.Y += rotate.Y; xyz.Z += rotate.Z;
3764 ds.SetViewpoint(ref xyz, ref hpr);
3765 }
3766 catch (ArgumentException)
3767 { hpr.X = 0; }
3768 break;
3769
3770 case 'a':
3771 hpr.X++;
3772 ds.SetViewpoint(ref xyz, ref hpr);
3773 break;
3774
3775 case 's':
3776 try
3777 {
3778 Vector3 rotate2 = (new Vector3(-1, 0, 0) * Quaternion.CreateFromEulers(hpr.Z * Utils.DEG_TO_RAD, hpr.Y * Utils.DEG_TO_RAD, hpr.X * Utils.DEG_TO_RAD));
3779
3780 xyz.X += rotate2.X; xyz.Y += rotate2.Y; xyz.Z += rotate2.Z;
3781 ds.SetViewpoint(ref xyz, ref hpr);
3782 }
3783 catch (ArgumentException)
3784 { hpr.X = 0; }
3785 break;
3786 case 'd':
3787 hpr.X--;
3788 ds.SetViewpoint(ref xyz, ref hpr);
3789 break;
3790 case 'r':
3791 xyz.Z++;
3792 ds.SetViewpoint(ref xyz, ref hpr);
3793 break;
3794 case 'f':
3795 xyz.Z--;
3796 ds.SetViewpoint(ref xyz, ref hpr);
3797 break;
3798 case 'e':
3799 xyz.Y++;
3800 ds.SetViewpoint(ref xyz, ref hpr);
3801 break;
3802 case 'q':
3803 xyz.Y--;
3804 ds.SetViewpoint(ref xyz, ref hpr);
3805 break;
3806 }
3807 }
3808
3809 public void step(int pause)
3810 {
3811
3812 ds.SetColor(1.0f, 1.0f, 0.0f);
3813 ds.SetTexture(ds.Texture.Wood);
3814 lock (_prims)
3815 {
3816 foreach (OdePrim prm in _prims)
3817 {
3818 //IntPtr body = d.GeomGetBody(prm.prim_geom);
3819 if (prm.prim_geom != IntPtr.Zero)
3820 {
3821 d.Vector3 pos;
3822 d.GeomCopyPosition(prm.prim_geom, out pos);
3823 //d.BodyCopyPosition(body, out pos);
3824
3825 d.Matrix3 R;
3826 d.GeomCopyRotation(prm.prim_geom, out R);
3827 //d.BodyCopyRotation(body, out R);
3828
3829
3830 d.Vector3 sides = new d.Vector3();
3831 sides.X = prm.Size.X;
3832 sides.Y = prm.Size.Y;
3833 sides.Z = prm.Size.Z;
3834
3835 ds.DrawBox(ref pos, ref R, ref sides);
3836 }
3837 }
3838 }
3839 ds.SetColor(1.0f, 0.0f, 0.0f);
3840 lock (_characters)
3841 {
3842 foreach (OdeCharacter chr in _characters)
3843 {
3844 if (chr.Shell != IntPtr.Zero)
3845 {
3846 IntPtr body = d.GeomGetBody(chr.Shell);
3847
3848 d.Vector3 pos;
3849 d.GeomCopyPosition(chr.Shell, out pos);
3850 //d.BodyCopyPosition(body, out pos);
3851
3852 d.Matrix3 R;
3853 d.GeomCopyRotation(chr.Shell, out R);
3854 //d.BodyCopyRotation(body, out R);
3855
3856 ds.DrawCapsule(ref pos, ref R, chr.Size.Z, 0.35f);
3857 d.Vector3 sides = new d.Vector3();
3858 sides.X = 0.5f;
3859 sides.Y = 0.5f;
3860 sides.Z = 0.5f;
3861
3862 ds.DrawBox(ref pos, ref R, ref sides);
3863 }
3864 }
3865 }
3866 }
3867
3868 public void start(int unused)
3869 {
3870 ds.SetViewpoint(ref xyz, ref hpr);
3871 }
3872#endif
3873 }
3874}
diff --git a/OpenSim/Region/Physics/ChOdePlugin/Tests/ODETestClass.cs b/OpenSim/Region/Physics/ChOdePlugin/Tests/ODETestClass.cs
new file mode 100644
index 0000000..69e2d03
--- /dev/null
+++ b/OpenSim/Region/Physics/ChOdePlugin/Tests/ODETestClass.cs
@@ -0,0 +1,122 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using Nini.Config;
30using NUnit.Framework;
31using OpenMetaverse;
32using OpenSim.Framework;
33using OpenSim.Region.Physics.Manager;
34using log4net;
35using System.Reflection;
36
37namespace OpenSim.Region.Physics.OdePlugin
38{
39 [TestFixture]
40 public class ODETestClass
41 {
42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
43
44 private OdePlugin cbt;
45 private PhysicsScene ps;
46 private IMeshingPlugin imp;
47
48 [SetUp]
49 public void Initialize()
50 {
51 // Loading ODEPlugin
52 cbt = new OdePlugin();
53 // Loading Zero Mesher
54 imp = new ZeroMesherPlugin();
55 // Getting Physics Scene
56 ps = cbt.GetScene("test");
57 // Initializing Physics Scene.
58 ps.Initialise(imp.GetMesher(),null);
59 float[] _heightmap = new float[(int)Constants.RegionSize * (int)Constants.RegionSize];
60 for (int i = 0; i < ((int)Constants.RegionSize * (int)Constants.RegionSize); i++)
61 {
62 _heightmap[i] = 21f;
63 }
64 ps.SetTerrain(_heightmap);
65 }
66
67 [TearDown]
68 public void Terminate()
69 {
70 ps.DeleteTerrain();
71 ps.Dispose();
72
73 }
74
75 [Test]
76 public void CreateAndDropPhysicalCube()
77 {
78 PrimitiveBaseShape newcube = PrimitiveBaseShape.CreateBox();
79 Vector3 position = new Vector3(((float)Constants.RegionSize * 0.5f), ((float)Constants.RegionSize * 0.5f), 128f);
80 Vector3 size = new Vector3(0.5f, 0.5f, 0.5f);
81 Quaternion rot = Quaternion.Identity;
82 PhysicsActor prim = ps.AddPrimShape("CoolShape", newcube, position, size, rot, true);
83 OdePrim oprim = (OdePrim)prim;
84 OdeScene pscene = (OdeScene) ps;
85
86 Assert.That(oprim.m_taintadd);
87
88 prim.LocalID = 5;
89
90 for (int i = 0; i < 58; i++)
91 {
92 ps.Simulate(0.133f);
93
94 Assert.That(oprim.prim_geom != (IntPtr)0);
95
96 Assert.That(oprim.m_targetSpace != (IntPtr)0);
97
98 //Assert.That(oprim.m_targetSpace == pscene.space);
99 m_log.Info("TargetSpace: " + oprim.m_targetSpace + " - SceneMainSpace: " + pscene.space);
100
101 Assert.That(!oprim.m_taintadd);
102 m_log.Info("Prim Position (" + oprim.m_localID + "): " + prim.Position.ToString());
103
104 // Make sure we're above the ground
105 //Assert.That(prim.Position.Z > 20f);
106 //m_log.Info("PrimCollisionScore (" + oprim.m_localID + "): " + oprim.m_collisionscore);
107
108 // Make sure we've got a Body
109 Assert.That(oprim.Body != (IntPtr)0);
110 //m_log.Info(
111 }
112
113 // Make sure we're not somewhere above the ground
114 Assert.That(prim.Position.Z < 21.5f);
115
116 ps.RemovePrim(prim);
117 Assert.That(oprim.m_taintremove);
118 ps.Simulate(0.133f);
119 Assert.That(oprim.Body == (IntPtr)0);
120 }
121 }
122}
diff --git a/OpenSim/Region/Physics/ChOdePlugin/drawstuff.cs b/OpenSim/Region/Physics/ChOdePlugin/drawstuff.cs
new file mode 100644
index 0000000..87ca446
--- /dev/null
+++ b/OpenSim/Region/Physics/ChOdePlugin/drawstuff.cs
@@ -0,0 +1,98 @@
1/*
2 * Copyright ODE
3 * Ode.NET - .NET bindings for ODE
4 * Jason Perkins (starkos@industriousone.com)
5 * Licensed under the New BSD
6 * Part of the OpenDynamicsEngine
7Open Dynamics Engine
8Copyright (c) 2001-2007, Russell L. Smith.
9All rights reserved.
10
11Redistribution and use in source and binary forms, with or without
12modification, are permitted provided that the following conditions
13are met:
14
15Redistributions of source code must retain the above copyright notice,
16this list of conditions and the following disclaimer.
17
18Redistributions in binary form must reproduce the above copyright notice,
19this list of conditions and the following disclaimer in the documentation
20and/or other materials provided with the distribution.
21
22Neither the names of ODE's copyright owner nor the names of its
23contributors may be used to endorse or promote products derived from
24this software without specific prior written permission.
25
26THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
27"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
28LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
29FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
30OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
31SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
32TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
33PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
34LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
35NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
36SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
37 *
38 *
39 */
40
41using System;
42using System.Runtime.InteropServices;
43using Ode.NET;
44
45namespace Drawstuff.NET
46{
47#if dDOUBLE
48 using dReal = System.Double;
49#else
50 using dReal = System.Single;
51#endif
52
53 public static class ds
54 {
55 public const int VERSION = 2;
56
57 public enum Texture
58 {
59 None,
60 Wood
61 }
62
63 [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
64 public delegate void CallbackFunction(int arg);
65
66 [StructLayout(LayoutKind.Sequential)]
67 public struct Functions
68 {
69 public int version;
70 public CallbackFunction start;
71 public CallbackFunction step;
72 public CallbackFunction command;
73 public CallbackFunction stop;
74 public string path_to_textures;
75 }
76
77 [DllImport("drawstuff", EntryPoint = "dsDrawBox")]
78 public static extern void DrawBox(ref d.Vector3 pos, ref d.Matrix3 R, ref d.Vector3 sides);
79
80 [DllImport("drawstuff", EntryPoint = "dsDrawCapsule")]
81 public static extern void DrawCapsule(ref d.Vector3 pos, ref d.Matrix3 R, dReal length, dReal radius);
82
83 [DllImport("drawstuff", EntryPoint = "dsDrawConvex")]
84 public static extern void DrawConvex(ref d.Vector3 pos, ref d.Matrix3 R, dReal[] planes, int planeCount, dReal[] points, int pointCount, int[] polygons);
85
86 [DllImport("drawstuff", EntryPoint = "dsSetColor")]
87 public static extern void SetColor(float red, float green, float blue);
88
89 [DllImport("drawstuff", EntryPoint = "dsSetTexture")]
90 public static extern void SetTexture(Texture texture);
91
92 [DllImport("drawstuff", EntryPoint = "dsSetViewpoint")]
93 public static extern void SetViewpoint(ref d.Vector3 xyz, ref d.Vector3 hpr);
94
95 [DllImport("drawstuff", EntryPoint = "dsSimulationLoop")]
96 public static extern void SimulationLoop(int argc, string[] argv, int window_width, int window_height, ref Functions fn);
97 }
98}
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index 880c3ea..8060ba0 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -208,6 +208,8 @@ namespace OpenSim.Region.Physics.Manager
208 public abstract void VehicleFloatParam(int param, float value); 208 public abstract void VehicleFloatParam(int param, float value);
209 public abstract void VehicleVectorParam(int param, Vector3 value); 209 public abstract void VehicleVectorParam(int param, Vector3 value);
210 public abstract void VehicleRotationParam(int param, Quaternion rotation); 210 public abstract void VehicleRotationParam(int param, Quaternion rotation);
211 public abstract void VehicleFlagsSet(int flags);
212 public abstract void VehicleFlagsRemove(int flags);
211 public abstract void VehicleFlags(int param, bool remove); 213 public abstract void VehicleFlags(int param, bool remove);
212 214
213 public abstract void SetVolumeDetect(int param); // Allows the detection of collisions with inherently non-physical prims. see llVolumeDetect for more 215 public abstract void SetVolumeDetect(int param); // Allows the detection of collisions with inherently non-physical prims. see llVolumeDetect for more
@@ -352,7 +354,17 @@ namespace OpenSim.Region.Physics.Manager
352 { 354 {
353 355
354 } 356 }
357
358 public override void VehicleFlagsSet(int flags)
359 {
360
361 }
362
363 public override void VehicleFlagsRemove(int flags)
364 {
355 365
366 }
367
356 public override void VehicleFlags(int param, bool remove) 368 public override void VehicleFlags(int param, bool remove)
357 { 369 {
358 370
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index a2229e8..6b8d1e2 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -733,7 +733,17 @@ namespace OpenSim.Region.Physics.OdePlugin
733 { 733 {
734 734
735 } 735 }
736
737 public override void VehicleFlagsSet(int flags)
738 {
736 739
740 }
741
742 public override void VehicleFlagsRemove(int flags)
743 {
744
745 }
746
737 public override void VehicleFlags(int param, bool remove) 747 public override void VehicleFlags(int param, bool remove)
738 { 748 {
739 749
@@ -1210,7 +1220,6 @@ namespace OpenSim.Region.Physics.OdePlugin
1210 1220
1211 public override float APIDDamping{ set { return; } } 1221 public override float APIDDamping{ set { return; } }
1212 1222
1213
1214 public override void SubscribeEvents(int ms) 1223 public override void SubscribeEvents(int ms)
1215 { 1224 {
1216 m_requestedUpdateFrequency = ms; 1225 m_requestedUpdateFrequency = ms;
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 03736d1..9ef2e9c 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -2354,6 +2354,16 @@ Console.WriteLine(" JointCreateFixed");
2354 { 2354 {
2355 m_vehicle.ProcessRotationVehicleParam((Vehicle) param, rotation); 2355 m_vehicle.ProcessRotationVehicleParam((Vehicle) param, rotation);
2356 } 2356 }
2357
2358 public override void VehicleFlagsSet(int flags)
2359 {
2360
2361 }
2362
2363 public override void VehicleFlagsRemove(int flags)
2364 {
2365
2366 }
2357 2367
2358 public override void VehicleFlags(int param, bool remove) 2368 public override void VehicleFlags(int param, bool remove)
2359 { 2369 {
@@ -2831,7 +2841,7 @@ Console.WriteLine(" JointCreateFixed");
2831 } 2841 }
2832 public override bool PIDActive { set { m_usePID = value; } } 2842 public override bool PIDActive { set { m_usePID = value; } }
2833 public override float PIDTau { set { m_PIDTau = value; } } 2843 public override float PIDTau { set { m_PIDTau = value; } }
2834 2844
2835 public override float PIDHoverHeight { set { m_PIDHoverHeight = value; ; } } 2845 public override float PIDHoverHeight { set { m_PIDHoverHeight = value; ; } }
2836 public override bool PIDHoverActive { set { m_useHoverPID = value; } } 2846 public override bool PIDHoverActive { set { m_useHoverPID = value; } }
2837 public override PIDHoverType PIDHoverType { set { m_PIDHoverType = value; } } 2847 public override PIDHoverType PIDHoverType { set { m_PIDHoverType = value; } }
diff --git a/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs b/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs
index a70179b..e722666 100644
--- a/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs
+++ b/OpenSim/Region/Physics/POSPlugin/POSCharacter.cs
@@ -181,7 +181,17 @@ namespace OpenSim.Region.Physics.POSPlugin
181 { 181 {
182 182
183 } 183 }
184
185 public override void VehicleFlagsSet(int flags)
186 {
187
188 }
189
190 public override void VehicleFlagsRemove(int flags)
191 {
184 192
193 }
194
185 public override void VehicleFlags(int param, bool remove) { } 195 public override void VehicleFlags(int param, bool remove) { }
186 196
187 public override void SetVolumeDetect(int param) 197 public override void SetVolumeDetect(int param)
diff --git a/OpenSim/Region/Physics/POSPlugin/POSPrim.cs b/OpenSim/Region/Physics/POSPlugin/POSPrim.cs
index 91ec3df..c129340 100644
--- a/OpenSim/Region/Physics/POSPlugin/POSPrim.cs
+++ b/OpenSim/Region/Physics/POSPlugin/POSPrim.cs
@@ -138,7 +138,17 @@ namespace OpenSim.Region.Physics.POSPlugin
138 { 138 {
139 139
140 } 140 }
141
142 public override void VehicleFlagsSet(int flags)
143 {
144
145 }
146
147 public override void VehicleFlagsRemove(int flags)
148 {
141 149
150 }
151
142 public override void VehicleFlags(int param, bool remove) { } 152 public override void VehicleFlags(int param, bool remove) { }
143 153
144 public override void SetVolumeDetect(int param) 154 public override void SetVolumeDetect(int param)
@@ -301,7 +311,7 @@ namespace OpenSim.Region.Physics.POSPlugin
301 { 311 {
302 set { return; } 312 set { return; }
303 } 313 }
304 314
305 public override Quaternion APIDTarget 315 public override Quaternion APIDTarget
306 { 316 {
307 set { return; } 317 set { return; }
diff --git a/OpenSim/Region/Physics/PhysXPlugin/PhysXCharacter.cs b/OpenSim/Region/Physics/PhysXPlugin/PhysXCharacter.cs
index 92261cd..fc3adac 100644
--- a/OpenSim/Region/Physics/PhysXPlugin/PhysXCharacter.cs
+++ b/OpenSim/Region/Physics/PhysXPlugin/PhysXCharacter.cs
@@ -188,6 +188,14 @@ namespace OpenSim.Region.Physics.PhysXPlugin
188 { 188 {
189 } 189 }
190 190
191 public override void VehicleFlagsSet(int param)
192 {
193 }
194
195 public override void VehicleFlagsRemove(int param)
196 {
197 }
198
191 public override void VehicleFlags(int param, bool remove) 199 public override void VehicleFlags(int param, bool remove)
192 { 200 {
193 } 201 }
diff --git a/OpenSim/Region/Physics/PhysXPlugin/PhysXPrim.cs b/OpenSim/Region/Physics/PhysXPlugin/PhysXPrim.cs
index c0e24fd..dc70c80 100644
--- a/OpenSim/Region/Physics/PhysXPlugin/PhysXPrim.cs
+++ b/OpenSim/Region/Physics/PhysXPlugin/PhysXPrim.cs
@@ -277,6 +277,8 @@ namespace OpenSim.Region.Physics.PhysXPlugin
277 277
278 } 278 }
279 279
280 public override void VehicleFlagsSet(int param) { }
281 public override void VehicleFlagsRemove(int param) { }
280 public override void VehicleFlags(int param, bool remove) { } 282 public override void VehicleFlags(int param, bool remove) { }
281 283
282 public override void SetVolumeDetect(int param) 284 public override void SetVolumeDetect(int param)
diff --git a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
index 1a99c83..92f060b 100644
--- a/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
+++ b/OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
@@ -88,89 +88,7 @@ namespace OpenSim.Region.RegionCombinerModule
88 public void RegionLoaded(Scene scene) 88 public void RegionLoaded(Scene scene)
89 { 89 {
90 if (enabledYN) 90 if (enabledYN)
91 {
92 RegionLoadedDoWork(scene); 91 RegionLoadedDoWork(scene);
93
94 scene.EventManager.OnNewPresence += NewPresence;
95 }
96 }
97
98 private void NewPresence(ScenePresence presence)
99 {
100 if (presence.IsChildAgent)
101 {
102 byte[] throttleData;
103
104 try
105 {
106 throttleData = presence.ControllingClient.GetThrottlesPacked(1);
107 }
108 catch (NotImplementedException)
109 {
110 return;
111 }
112
113 if (throttleData == null)
114 return;
115
116 if (throttleData.Length == 0)
117 return;
118
119 if (throttleData.Length != 28)
120 return;
121
122 byte[] adjData;
123 int pos = 0;
124
125 if (!BitConverter.IsLittleEndian)
126 {
127 byte[] newData = new byte[7 * 4];
128 Buffer.BlockCopy(throttleData, 0, newData, 0, 7 * 4);
129
130 for (int i = 0; i < 7; i++)
131 Array.Reverse(newData, i * 4, 4);
132
133 adjData = newData;
134 }
135 else
136 {
137 adjData = throttleData;
138 }
139
140 // 0.125f converts from bits to bytes
141 int resend = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4;
142 int land = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4;
143 int wind = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4;
144 int cloud = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4;
145 int task = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4;
146 int texture = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f); pos += 4;
147 int asset = (int)(BitConverter.ToSingle(adjData, pos) * 0.125f);
148 // State is a subcategory of task that we allocate a percentage to
149
150
151 //int total = resend + land + wind + cloud + task + texture + asset;
152
153 byte[] data = new byte[7 * 4];
154 int ii = 0;
155
156 Buffer.BlockCopy(Utils.FloatToBytes(resend), 0, data, ii, 4); ii += 4;
157 Buffer.BlockCopy(Utils.FloatToBytes(land * 50), 0, data, ii, 4); ii += 4;
158 Buffer.BlockCopy(Utils.FloatToBytes(wind), 0, data, ii, 4); ii += 4;
159 Buffer.BlockCopy(Utils.FloatToBytes(cloud), 0, data, ii, 4); ii += 4;
160 Buffer.BlockCopy(Utils.FloatToBytes(task), 0, data, ii, 4); ii += 4;
161 Buffer.BlockCopy(Utils.FloatToBytes(texture), 0, data, ii, 4); ii += 4;
162 Buffer.BlockCopy(Utils.FloatToBytes(asset), 0, data, ii, 4);
163
164 try
165 {
166 presence.ControllingClient.SetChildAgentThrottle(data);
167 }
168 catch (NotImplementedException)
169 {
170 return;
171 }
172
173 }
174 } 92 }
175 93
176 private void RegionLoadedDoWork(Scene scene) 94 private void RegionLoadedDoWork(Scene scene)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs
new file mode 100644
index 0000000..99973b4
--- /dev/null
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/CM_Api.cs
@@ -0,0 +1,477 @@
1using System;
2using System.Reflection;
3using System.Collections;
4using System.Collections.Generic;
5using System.Runtime.Remoting.Lifetime;
6using OpenMetaverse;
7using Nini.Config;
8using OpenSim;
9using OpenSim.Framework;
10using OpenSim.Region.CoreModules.World.Meta7Windlight;
11using OpenSim.Region.Framework.Interfaces;
12using OpenSim.Region.Framework.Scenes;
13using OpenSim.Region.ScriptEngine.Shared;
14using OpenSim.Region.ScriptEngine.Shared.Api.Plugins;
15using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
16using OpenSim.Region.ScriptEngine.Interfaces;
17using OpenSim.Region.ScriptEngine.Shared.Api.Interfaces;
18
19using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat;
20using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger;
21using LSL_Key = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
22using LSL_List = OpenSim.Region.ScriptEngine.Shared.LSL_Types.list;
23using LSL_Rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion;
24using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
25using LSL_Vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3;
26
27namespace OpenSim.Region.ScriptEngine.Shared.Api
28{
29 [Serializable]
30 public class CM_Api : MarshalByRefObject, ICM_Api, IScriptApi
31 {
32 internal IScriptEngine m_ScriptEngine;
33 internal SceneObjectPart m_host;
34 internal uint m_localID;
35 internal UUID m_itemID;
36 internal bool m_CMFunctionsEnabled = false;
37 internal IScriptModuleComms m_comms = null;
38
39 public void Initialize(IScriptEngine ScriptEngine, SceneObjectPart host, uint localID, UUID itemID)
40 {
41 m_ScriptEngine = ScriptEngine;
42 m_host = host;
43 m_localID = localID;
44 m_itemID = itemID;
45
46 if (m_ScriptEngine.Config.GetBoolean("AllowCareminsterFunctions", false))
47 m_CMFunctionsEnabled = true;
48
49 m_comms = m_ScriptEngine.World.RequestModuleInterface<IScriptModuleComms>();
50 if (m_comms == null)
51 m_CMFunctionsEnabled = false;
52 }
53
54 public override Object InitializeLifetimeService()
55 {
56 ILease lease = (ILease)base.InitializeLifetimeService();
57
58 if (lease.CurrentState == LeaseState.Initial)
59 {
60 lease.InitialLeaseTime = TimeSpan.FromMinutes(0);
61 // lease.RenewOnCallTime = TimeSpan.FromSeconds(10.0);
62 // lease.SponsorshipTimeout = TimeSpan.FromMinutes(1.0);
63 }
64 return lease;
65 }
66
67 public Scene World
68 {
69 get { return m_ScriptEngine.World; }
70 }
71
72 //
73 //Dumps an error message on the debug console.
74 //
75
76 internal void CMShoutError(string message)
77 {
78 if (message.Length > 1023)
79 message = message.Substring(0, 1023);
80
81 World.SimChat(Utils.StringToBytes(message),
82 ChatTypeEnum.Shout, ScriptBaseClass.DEBUG_CHANNEL, m_host.ParentGroup.RootPart.AbsolutePosition, m_host.Name, m_host.UUID, true);
83
84 IWorldComm wComm = m_ScriptEngine.World.RequestModuleInterface<IWorldComm>();
85 wComm.DeliverMessage(ChatTypeEnum.Shout, ScriptBaseClass.DEBUG_CHANNEL, m_host.Name, m_host.UUID, message);
86 }
87
88 /// <summary>
89 /// Get the current Windlight scene
90 /// </summary>
91 /// <returns>List of windlight parameters</returns>
92 public LSL_List cmGetWindlightScene(LSL_List rules)
93 {
94 if (!m_CMFunctionsEnabled)
95 {
96 CMShoutError("Careminster functions are not enabled.");
97 return new LSL_List();
98 }
99 m_host.AddScriptLPS(1);
100 RegionMeta7WindlightData wl = m_host.ParentGroup.Scene.RegionInfo.WindlightSettings;
101
102 LSL_List values = new LSL_List();
103 int idx = 0;
104 while (idx < rules.Length)
105 {
106 uint rule = (uint)rules.GetLSLIntegerItem(idx);
107 LSL_List toadd = new LSL_List();
108
109 switch (rule)
110 {
111 case (int)ScriptBaseClass.WL_AMBIENT:
112 toadd.Add(new LSL_Rotation(wl.ambient.X, wl.ambient.Y, wl.ambient.Z, wl.ambient.W));
113 break;
114 case (int)ScriptBaseClass.WL_BIG_WAVE_DIRECTION:
115 toadd.Add(new LSL_Vector(wl.bigWaveDirection.X, wl.bigWaveDirection.Y, 0.0f));
116 break;
117 case (int)ScriptBaseClass.WL_BLUE_DENSITY:
118 toadd.Add(new LSL_Rotation(wl.blueDensity.X, wl.blueDensity.Y, wl.blueDensity.Z, wl.blueDensity.W));
119 break;
120 case (int)ScriptBaseClass.WL_BLUR_MULTIPLIER:
121 toadd.Add(new LSL_Float(wl.blurMultiplier));
122 break;
123 case (int)ScriptBaseClass.WL_CLOUD_COLOR:
124 toadd.Add(new LSL_Rotation(wl.cloudColor.X, wl.cloudColor.Y, wl.cloudColor.Z, wl.cloudColor.W));
125 break;
126 case (int)ScriptBaseClass.WL_CLOUD_COVERAGE:
127 toadd.Add(new LSL_Float(wl.cloudCoverage));
128 break;
129 case (int)ScriptBaseClass.WL_CLOUD_DETAIL_XY_DENSITY:
130 toadd.Add(new LSL_Vector(wl.cloudDetailXYDensity.X, wl.cloudDetailXYDensity.Y, wl.cloudDetailXYDensity.Z));
131 break;
132 case (int)ScriptBaseClass.WL_CLOUD_SCALE:
133 toadd.Add(new LSL_Float(wl.cloudScale));
134 break;
135 case (int)ScriptBaseClass.WL_CLOUD_SCROLL_X:
136 toadd.Add(new LSL_Float(wl.cloudScrollX));
137 break;
138 case (int)ScriptBaseClass.WL_CLOUD_SCROLL_X_LOCK:
139 toadd.Add(new LSL_Integer(wl.cloudScrollXLock ? 1 : 0));
140 break;
141 case (int)ScriptBaseClass.WL_CLOUD_SCROLL_Y:
142 toadd.Add(new LSL_Float(wl.cloudScrollY));
143 break;
144 case (int)ScriptBaseClass.WL_CLOUD_SCROLL_Y_LOCK:
145 toadd.Add(new LSL_Integer(wl.cloudScrollYLock ? 1 : 0));
146 break;
147 case (int)ScriptBaseClass.WL_CLOUD_XY_DENSITY:
148 toadd.Add(new LSL_Vector(wl.cloudXYDensity.X, wl.cloudXYDensity.Y, wl.cloudXYDensity.Z));
149 break;
150 case (int)ScriptBaseClass.WL_DENSITY_MULTIPLIER:
151 toadd.Add(new LSL_Float(wl.densityMultiplier));
152 break;
153 case (int)ScriptBaseClass.WL_DISTANCE_MULTIPLIER:
154 toadd.Add(new LSL_Float(wl.distanceMultiplier));
155 break;
156 case (int)ScriptBaseClass.WL_DRAW_CLASSIC_CLOUDS:
157 toadd.Add(new LSL_Integer(wl.drawClassicClouds ? 1 : 0));
158 break;
159 case (int)ScriptBaseClass.WL_EAST_ANGLE:
160 toadd.Add(new LSL_Float(wl.eastAngle));
161 break;
162 case (int)ScriptBaseClass.WL_FRESNEL_OFFSET:
163 toadd.Add(new LSL_Float(wl.fresnelOffset));
164 break;
165 case (int)ScriptBaseClass.WL_FRESNEL_SCALE:
166 toadd.Add(new LSL_Float(wl.fresnelScale));
167 break;
168 case (int)ScriptBaseClass.WL_HAZE_DENSITY:
169 toadd.Add(new LSL_Float(wl.hazeDensity));
170 break;
171 case (int)ScriptBaseClass.WL_HAZE_HORIZON:
172 toadd.Add(new LSL_Float(wl.hazeHorizon));
173 break;
174 case (int)ScriptBaseClass.WL_HORIZON:
175 toadd.Add(new LSL_Rotation(wl.horizon.X, wl.horizon.Y, wl.horizon.Z, wl.horizon.W));
176 break;
177 case (int)ScriptBaseClass.WL_LITTLE_WAVE_DIRECTION:
178 toadd.Add(new LSL_Vector(wl.littleWaveDirection.X, wl.littleWaveDirection.Y, 0.0f));
179 break;
180 case (int)ScriptBaseClass.WL_MAX_ALTITUDE:
181 toadd.Add(new LSL_Integer(wl.maxAltitude));
182 break;
183 case (int)ScriptBaseClass.WL_NORMAL_MAP_TEXTURE:
184 toadd.Add(new LSL_Key(wl.normalMapTexture.ToString()));
185 break;
186 case (int)ScriptBaseClass.WL_REFLECTION_WAVELET_SCALE:
187 toadd.Add(new LSL_Vector(wl.reflectionWaveletScale.X, wl.reflectionWaveletScale.Y, wl.reflectionWaveletScale.Z));
188 break;
189 case (int)ScriptBaseClass.WL_REFRACT_SCALE_ABOVE:
190 toadd.Add(new LSL_Float(wl.refractScaleAbove));
191 break;
192 case (int)ScriptBaseClass.WL_REFRACT_SCALE_BELOW:
193 toadd.Add(new LSL_Float(wl.refractScaleBelow));
194 break;
195 case (int)ScriptBaseClass.WL_SCENE_GAMMA:
196 toadd.Add(new LSL_Float(wl.sceneGamma));
197 break;
198 case (int)ScriptBaseClass.WL_STAR_BRIGHTNESS:
199 toadd.Add(new LSL_Float(wl.starBrightness));
200 break;
201 case (int)ScriptBaseClass.WL_SUN_GLOW_FOCUS:
202 toadd.Add(new LSL_Float(wl.sunGlowFocus));
203 break;
204 case (int)ScriptBaseClass.WL_SUN_GLOW_SIZE:
205 toadd.Add(new LSL_Float(wl.sunGlowSize));
206 break;
207 case (int)ScriptBaseClass.WL_SUN_MOON_COLOR:
208 toadd.Add(new LSL_Rotation(wl.sunMoonColor.X, wl.sunMoonColor.Y, wl.sunMoonColor.Z, wl.sunMoonColor.W));
209 break;
210 case (int)ScriptBaseClass.WL_UNDERWATER_FOG_MODIFIER:
211 toadd.Add(new LSL_Float(wl.underwaterFogModifier));
212 break;
213 case (int)ScriptBaseClass.WL_WATER_COLOR:
214 toadd.Add(new LSL_Vector(wl.waterColor.X, wl.waterColor.Y, wl.waterColor.Z));
215 break;
216 case (int)ScriptBaseClass.WL_WATER_FOG_DENSITY_EXPONENT:
217 toadd.Add(new LSL_Float(wl.waterFogDensityExponent));
218 break;
219 }
220
221 if (toadd.Length > 0)
222 {
223 values.Add(rule);
224 values.Add(toadd.Data[0]);
225 }
226 idx++;
227 }
228
229
230 return values;
231
232 }
233
234 private RegionMeta7WindlightData getWindlightProfileFromRules(LSL_List rules)
235 {
236 RegionMeta7WindlightData wl = (RegionMeta7WindlightData)m_host.ParentGroup.Scene.RegionInfo.WindlightSettings.Clone();
237
238 LSL_List values = new LSL_List();
239 int idx = 0;
240 while (idx < rules.Length)
241 {
242 uint rule = (uint)rules.GetLSLIntegerItem(idx);
243 LSL_Types.Quaternion iQ;
244 LSL_Types.Vector3 iV;
245 switch (rule)
246 {
247 case (int)ScriptBaseClass.WL_SUN_MOON_POSITION:
248 idx++;
249 wl.sunMoonPosition = (float)rules.GetLSLFloatItem(idx);
250 break;
251 case (int)ScriptBaseClass.WL_AMBIENT:
252 idx++;
253 iQ = rules.GetQuaternionItem(idx);
254 wl.ambient = new Vector4((float)iQ.x, (float)iQ.y, (float)iQ.z, (float)iQ.s);
255 break;
256 case (int)ScriptBaseClass.WL_BIG_WAVE_DIRECTION:
257 idx++;
258 iV = rules.GetVector3Item(idx);
259 wl.bigWaveDirection = new Vector2((float)iV.x, (float)iV.y);
260 break;
261 case (int)ScriptBaseClass.WL_BLUE_DENSITY:
262 idx++;
263 iQ = rules.GetQuaternionItem(idx);
264 wl.blueDensity = new Vector4((float)iQ.x, (float)iQ.y, (float)iQ.z, (float)iQ.s);
265 break;
266 case (int)ScriptBaseClass.WL_BLUR_MULTIPLIER:
267 idx++;
268 wl.blurMultiplier = (float)rules.GetLSLFloatItem(idx);
269 break;
270 case (int)ScriptBaseClass.WL_CLOUD_COLOR:
271 idx++;
272 iQ = rules.GetQuaternionItem(idx);
273 wl.cloudColor = new Vector4((float)iQ.x, (float)iQ.y, (float)iQ.z, (float)iQ.s);
274 break;
275 case (int)ScriptBaseClass.WL_CLOUD_COVERAGE:
276 idx++;
277 wl.cloudCoverage = (float)rules.GetLSLFloatItem(idx);
278 break;
279 case (int)ScriptBaseClass.WL_CLOUD_DETAIL_XY_DENSITY:
280 idx++;
281 iV = rules.GetVector3Item(idx);
282 wl.cloudDetailXYDensity = new Vector3((float)iV.x, (float)iV.y, (float)iV.z);
283 break;
284 case (int)ScriptBaseClass.WL_CLOUD_SCALE:
285 idx++;
286 wl.cloudScale = (float)rules.GetLSLFloatItem(idx);
287 break;
288 case (int)ScriptBaseClass.WL_CLOUD_SCROLL_X:
289 idx++;
290 wl.cloudScrollX = (float)rules.GetLSLFloatItem(idx);
291 break;
292 case (int)ScriptBaseClass.WL_CLOUD_SCROLL_X_LOCK:
293 idx++;
294 wl.cloudScrollXLock = rules.GetLSLIntegerItem(idx).value == 1 ? true : false;
295 break;
296 case (int)ScriptBaseClass.WL_CLOUD_SCROLL_Y:
297 idx++;
298 wl.cloudScrollY = (float)rules.GetLSLFloatItem(idx);
299 break;
300 case (int)ScriptBaseClass.WL_CLOUD_SCROLL_Y_LOCK:
301 idx++;
302 wl.cloudScrollYLock = rules.GetLSLIntegerItem(idx).value == 1 ? true : false;
303 break;
304 case (int)ScriptBaseClass.WL_CLOUD_XY_DENSITY:
305 idx++;
306 iV = rules.GetVector3Item(idx);
307 wl.cloudXYDensity = new Vector3((float)iV.x, (float)iV.y, (float)iV.z);
308 break;
309 case (int)ScriptBaseClass.WL_DENSITY_MULTIPLIER:
310 idx++;
311 wl.densityMultiplier = (float)rules.GetLSLFloatItem(idx);
312 break;
313 case (int)ScriptBaseClass.WL_DISTANCE_MULTIPLIER:
314 idx++;
315 wl.distanceMultiplier = (float)rules.GetLSLFloatItem(idx);
316 break;
317 case (int)ScriptBaseClass.WL_DRAW_CLASSIC_CLOUDS:
318 idx++;
319 wl.drawClassicClouds = rules.GetLSLIntegerItem(idx).value == 1 ? true : false;
320 break;
321 case (int)ScriptBaseClass.WL_EAST_ANGLE:
322 idx++;
323 wl.eastAngle = (float)rules.GetLSLFloatItem(idx);
324 break;
325 case (int)ScriptBaseClass.WL_FRESNEL_OFFSET:
326 idx++;
327 wl.fresnelOffset = (float)rules.GetLSLFloatItem(idx);
328 break;
329 case (int)ScriptBaseClass.WL_FRESNEL_SCALE:
330 idx++;
331 wl.fresnelScale = (float)rules.GetLSLFloatItem(idx);
332 break;
333 case (int)ScriptBaseClass.WL_HAZE_DENSITY:
334 idx++;
335 wl.hazeDensity = (float)rules.GetLSLFloatItem(idx);
336 break;
337 case (int)ScriptBaseClass.WL_HAZE_HORIZON:
338 idx++;
339 wl.hazeHorizon = (float)rules.GetLSLFloatItem(idx);
340 break;
341 case (int)ScriptBaseClass.WL_HORIZON:
342 idx++;
343 iQ = rules.GetQuaternionItem(idx);
344 wl.horizon = new Vector4((float)iQ.x, (float)iQ.y, (float)iQ.z, (float)iQ.s);
345 break;
346 case (int)ScriptBaseClass.WL_LITTLE_WAVE_DIRECTION:
347 idx++;
348 iV = rules.GetVector3Item(idx);
349 wl.littleWaveDirection = new Vector2((float)iV.x, (float)iV.y);
350 break;
351 case (int)ScriptBaseClass.WL_MAX_ALTITUDE:
352 idx++;
353 wl.maxAltitude = (ushort)rules.GetLSLIntegerItem(idx).value;
354 break;
355 case (int)ScriptBaseClass.WL_NORMAL_MAP_TEXTURE:
356 idx++;
357 wl.normalMapTexture = new UUID(rules.GetLSLStringItem(idx).m_string);
358 break;
359 case (int)ScriptBaseClass.WL_REFLECTION_WAVELET_SCALE:
360 idx++;
361 iV = rules.GetVector3Item(idx);
362 wl.reflectionWaveletScale = new Vector3((float)iV.x, (float)iV.y, (float)iV.z);
363 break;
364 case (int)ScriptBaseClass.WL_REFRACT_SCALE_ABOVE:
365 idx++;
366 wl.refractScaleAbove = (float)rules.GetLSLFloatItem(idx);
367 break;
368 case (int)ScriptBaseClass.WL_REFRACT_SCALE_BELOW:
369 idx++;
370 wl.refractScaleBelow = (float)rules.GetLSLFloatItem(idx);
371 break;
372 case (int)ScriptBaseClass.WL_SCENE_GAMMA:
373 idx++;
374 wl.sceneGamma = (float)rules.GetLSLFloatItem(idx);
375 break;
376 case (int)ScriptBaseClass.WL_STAR_BRIGHTNESS:
377 idx++;
378 wl.starBrightness = (float)rules.GetLSLFloatItem(idx);
379 break;
380 case (int)ScriptBaseClass.WL_SUN_GLOW_FOCUS:
381 idx++;
382 wl.sunGlowFocus = (float)rules.GetLSLFloatItem(idx);
383 break;
384 case (int)ScriptBaseClass.WL_SUN_GLOW_SIZE:
385 idx++;
386 wl.sunGlowSize = (float)rules.GetLSLFloatItem(idx);
387 break;
388 case (int)ScriptBaseClass.WL_SUN_MOON_COLOR:
389 idx++;
390 iQ = rules.GetQuaternionItem(idx);
391 wl.sunMoonColor = new Vector4((float)iQ.x, (float)iQ.y, (float)iQ.z, (float)iQ.s);
392 break;
393 case (int)ScriptBaseClass.WL_UNDERWATER_FOG_MODIFIER:
394 idx++;
395 wl.underwaterFogModifier = (float)rules.GetLSLFloatItem(idx);
396 break;
397 case (int)ScriptBaseClass.WL_WATER_COLOR:
398 idx++;
399 iV = rules.GetVector3Item(idx);
400 wl.waterColor = new Vector3((float)iV.x, (float)iV.y, (float)iV.z);
401 break;
402 case (int)ScriptBaseClass.WL_WATER_FOG_DENSITY_EXPONENT:
403 idx++;
404 wl.waterFogDensityExponent = (float)rules.GetLSLFloatItem(idx);
405 break;
406 }
407 idx++;
408 }
409 return wl;
410 }
411 /// <summary>
412 /// Set the current Windlight scene
413 /// </summary>
414 /// <param name="rules"></param>
415 /// <returns>success: true or false</returns>
416 public int cmSetWindlightScene(LSL_List rules)
417 {
418 if (!m_CMFunctionsEnabled)
419 {
420 CMShoutError("Careminster functions are not enabled.");
421 return 0;
422 }
423 if (!World.RegionInfo.EstateSettings.IsEstateManager(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200)
424 {
425 CMShoutError("cmSetWindlightScene can only be used by estate managers or owners.");
426 return 0;
427 }
428 int success = 0;
429 m_host.AddScriptLPS(1);
430 if (Meta7WindlightModule.EnableWindlight)
431 {
432 RegionMeta7WindlightData wl = getWindlightProfileFromRules(rules);
433 m_host.ParentGroup.Scene.StoreWindlightProfile(wl);
434 success = 1;
435 }
436 else
437 {
438 CMShoutError("Windlight module is disabled");
439 return 0;
440 }
441 return success;
442 }
443 /// <summary>
444 /// Set the current Windlight scene to a target avatar
445 /// </summary>
446 /// <param name="rules"></param>
447 /// <returns>success: true or false</returns>
448 public int cmSetWindlightSceneTargeted(LSL_List rules, LSL_Key target)
449 {
450 if (!m_CMFunctionsEnabled)
451 {
452 CMShoutError("Careminster functions are not enabled.");
453 return 0;
454 }
455 if (!World.RegionInfo.EstateSettings.IsEstateManager(m_host.OwnerID) && World.GetScenePresence(m_host.OwnerID).GodLevel < 200)
456 {
457 CMShoutError("cmSetWindlightSceneTargeted can only be used by estate managers or owners.");
458 return 0;
459 }
460 int success = 0;
461 m_host.AddScriptLPS(1);
462 if (Meta7WindlightModule.EnableWindlight)
463 {
464 RegionMeta7WindlightData wl = getWindlightProfileFromRules(rules);
465 World.EventManager.TriggerOnSendNewWindlightProfileTargeted(wl, new UUID(target.m_string));
466 success = 1;
467 }
468 else
469 {
470 CMShoutError("Windlight module is disabled");
471 return 0;
472 }
473 return success;
474 }
475
476 }
477}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index dc4249c..3f9c026 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -28,6 +28,7 @@
28using System; 28using System;
29using System.Collections; 29using System.Collections;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Diagnostics; //for [DebuggerNonUserCode]
31using System.Runtime.Remoting.Lifetime; 32using System.Runtime.Remoting.Lifetime;
32using System.Text; 33using System.Text;
33using System.Threading; 34using System.Threading;
@@ -152,6 +153,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
152 get { return m_ScriptEngine.World; } 153 get { return m_ScriptEngine.World; }
153 } 154 }
154 155
156 [DebuggerNonUserCode]
155 public void state(string newState) 157 public void state(string newState)
156 { 158 {
157 m_ScriptEngine.SetState(m_itemID, newState); 159 m_ScriptEngine.SetState(m_itemID, newState);
@@ -161,6 +163,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
161 /// Reset the named script. The script must be present 163 /// Reset the named script. The script must be present
162 /// in the same prim. 164 /// in the same prim.
163 /// </summary> 165 /// </summary>
166 [DebuggerNonUserCode]
164 public void llResetScript() 167 public void llResetScript()
165 { 168 {
166 m_host.AddScriptLPS(1); 169 m_host.AddScriptLPS(1);
@@ -219,7 +222,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
219 222
220 public List<SceneObjectPart> GetLinkParts(int linkType) 223 public List<SceneObjectPart> GetLinkParts(int linkType)
221 { 224 {
222 List<SceneObjectPart> ret = new List<SceneObjectPart>(); 225 List<SceneObjectPart> ret = new List<SceneObjectPart>();
226 if (m_host == null || m_host.ParentGroup == null || m_host.ParentGroup.IsDeleted)
227 return ret;
223 ret.Add(m_host); 228 ret.Add(m_host);
224 229
225 switch (linkType) 230 switch (linkType)
@@ -273,40 +278,48 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
273 protected UUID InventorySelf() 278 protected UUID InventorySelf()
274 { 279 {
275 UUID invItemID = new UUID(); 280 UUID invItemID = new UUID();
276 281 bool unlock = false;
277 lock (m_host.TaskInventory) 282 if (!m_host.TaskInventory.IsReadLockedByMe())
278 { 283 {
279 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 284 m_host.TaskInventory.LockItemsForRead(true);
285 unlock = true;
286 }
287 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
288 {
289 if (inv.Value.Type == 10 && inv.Value.ItemID == m_itemID)
280 { 290 {
281 if (inv.Value.Type == 10 && inv.Value.ItemID == m_itemID) 291 invItemID = inv.Key;
282 { 292 break;
283 invItemID = inv.Key;
284 break;
285 }
286 } 293 }
287 } 294 }
288 295 if (unlock)
296 {
297 m_host.TaskInventory.LockItemsForRead(false);
298 }
289 return invItemID; 299 return invItemID;
290 } 300 }
291 301
292 protected UUID InventoryKey(string name, int type) 302 protected UUID InventoryKey(string name, int type)
293 { 303 {
294 m_host.AddScriptLPS(1); 304 m_host.AddScriptLPS(1);
295 305 m_host.TaskInventory.LockItemsForRead(true);
296 lock (m_host.TaskInventory) 306
307 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
297 { 308 {
298 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 309 if (inv.Value.Name == name)
299 { 310 {
300 if (inv.Value.Name == name) 311 m_host.TaskInventory.LockItemsForRead(false);
312
313 if (inv.Value.Type != type)
301 { 314 {
302 if (inv.Value.Type != type) 315 return UUID.Zero;
303 return UUID.Zero;
304
305 return inv.Value.AssetID;
306 } 316 }
317
318 return inv.Value.AssetID;
307 } 319 }
308 } 320 }
309 321
322 m_host.TaskInventory.LockItemsForRead(false);
310 return UUID.Zero; 323 return UUID.Zero;
311 } 324 }
312 325
@@ -314,17 +327,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
314 { 327 {
315 m_host.AddScriptLPS(1); 328 m_host.AddScriptLPS(1);
316 329
317 lock (m_host.TaskInventory) 330
331 m_host.TaskInventory.LockItemsForRead(true);
332
333 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
318 { 334 {
319 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 335 if (inv.Value.Name == name)
320 { 336 {
321 if (inv.Value.Name == name) 337 m_host.TaskInventory.LockItemsForRead(false);
322 { 338 return inv.Value.AssetID;
323 return inv.Value.AssetID;
324 }
325 } 339 }
326 } 340 }
327 341
342 m_host.TaskInventory.LockItemsForRead(false);
343
344
328 return UUID.Zero; 345 return UUID.Zero;
329 } 346 }
330 347
@@ -706,6 +723,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
706 { 723 {
707 //A and B should both be normalized 724 //A and B should both be normalized
708 m_host.AddScriptLPS(1); 725 m_host.AddScriptLPS(1);
726 /* This method is more accurate than the SL one, and thus causes problems
727 for scripts that deal with the SL inaccuracy around 180-degrees -.- .._.
728
709 double dotProduct = LSL_Vector.Dot(a, b); 729 double dotProduct = LSL_Vector.Dot(a, b);
710 LSL_Vector crossProduct = LSL_Vector.Cross(a, b); 730 LSL_Vector crossProduct = LSL_Vector.Cross(a, b);
711 double magProduct = LSL_Vector.Mag(a) * LSL_Vector.Mag(b); 731 double magProduct = LSL_Vector.Mag(a) * LSL_Vector.Mag(b);
@@ -722,8 +742,57 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
722 return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f); 742 return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
723 743
724 return new LSL_Rotation((float)x, (float)y, (float)z, (float)w); 744 return new LSL_Rotation((float)x, (float)y, (float)z, (float)w);
725 } 745 */
726 746
747 // This method mimics the 180 errors found in SL
748 // See www.euclideanspace.com... angleBetween
749 LSL_Vector vec_a = a;
750 LSL_Vector vec_b = b;
751
752 // Eliminate zero length
753 LSL_Float vec_a_mag = LSL_Vector.Mag(vec_a);
754 LSL_Float vec_b_mag = LSL_Vector.Mag(vec_b);
755 if (vec_a_mag < 0.00001 ||
756 vec_b_mag < 0.00001)
757 {
758 return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
759 }
760
761 // Normalize
762 vec_a = llVecNorm(vec_a);
763 vec_b = llVecNorm(vec_b);
764
765 // Calculate axis and rotation angle
766 LSL_Vector axis = vec_a % vec_b;
767 LSL_Float cos_theta = vec_a * vec_b;
768
769 // Check if parallel
770 if (cos_theta > 0.99999)
771 {
772 return new LSL_Rotation(0.0f, 0.0f, 0.0f, 1.0f);
773 }
774
775 // Check if anti-parallel
776 else if (cos_theta < -0.99999)
777 {
778 LSL_Vector orthog_axis = new LSL_Vector(1.0, 0.0, 0.0) - (vec_a.x / (vec_a * vec_a) * vec_a);
779 if (LSL_Vector.Mag(orthog_axis) < 0.000001) orthog_axis = new LSL_Vector(0.0, 0.0, 1.0);
780 return new LSL_Rotation((float)orthog_axis.x, (float)orthog_axis.y, (float)orthog_axis.z, 0.0);
781 }
782 else // other rotation
783 {
784 LSL_Float theta = (LSL_Float)Math.Acos(cos_theta) * 0.5f;
785 axis = llVecNorm(axis);
786 double x, y, z, s, t;
787 s = Math.Cos(theta);
788 t = Math.Sin(theta);
789 x = axis.x * t;
790 y = axis.y * t;
791 z = axis.z * t;
792 return new LSL_Rotation(x,y,z,s);
793 }
794 }
795
727 public void llWhisper(int channelID, string text) 796 public void llWhisper(int channelID, string text)
728 { 797 {
729 m_host.AddScriptLPS(1); 798 m_host.AddScriptLPS(1);
@@ -1050,7 +1119,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1050 public virtual void llDie() 1119 public virtual void llDie()
1051 { 1120 {
1052 m_host.AddScriptLPS(1); 1121 m_host.AddScriptLPS(1);
1053 throw new SelfDeleteException(); 1122 if (!m_host.IsAttachment) throw new SelfDeleteException();
1054 } 1123 }
1055 1124
1056 public LSL_Float llGround(LSL_Vector offset) 1125 public LSL_Float llGround(LSL_Vector offset)
@@ -1122,7 +1191,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1122 } 1191 }
1123 1192
1124 public void llSetStatus(int status, int value) 1193 public void llSetStatus(int status, int value)
1125 { 1194 {
1195 if (m_host == null || m_host.ParentGroup == null || m_host.ParentGroup.IsDeleted)
1196 return;
1126 m_host.AddScriptLPS(1); 1197 m_host.AddScriptLPS(1);
1127 1198
1128 int statusrotationaxis = 0; 1199 int statusrotationaxis = 0;
@@ -1297,7 +1368,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1297 } 1368 }
1298 1369
1299 protected void SetScale(SceneObjectPart part, LSL_Vector scale) 1370 protected void SetScale(SceneObjectPart part, LSL_Vector scale)
1300 { 1371 {
1301 // TODO: this needs to trigger a persistance save as well 1372 // TODO: this needs to trigger a persistance save as well
1302 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted) 1373 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1303 return; 1374 return;
@@ -1352,6 +1423,48 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1352 { 1423 {
1353 m_host.AddScriptLPS(1); 1424 m_host.AddScriptLPS(1);
1354 1425
1426 SetColor(m_host, color, face);
1427 }
1428
1429 protected void SetColor(SceneObjectPart part, LSL_Vector color, int face)
1430 {
1431 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1432 return;
1433
1434 Primitive.TextureEntry tex = part.Shape.Textures;
1435 Color4 texcolor;
1436 if (face >= 0 && face < GetNumberOfSides(part))
1437 {
1438 texcolor = tex.CreateFace((uint)face).RGBA;
1439 texcolor.R = Util.Clip((float)color.x, 0.0f, 1.0f);
1440 texcolor.G = Util.Clip((float)color.y, 0.0f, 1.0f);
1441 texcolor.B = Util.Clip((float)color.z, 0.0f, 1.0f);
1442 tex.FaceTextures[face].RGBA = texcolor;
1443 part.UpdateTexture(tex);
1444 return;
1445 }
1446 else if (face == ScriptBaseClass.ALL_SIDES)
1447 {
1448 for (uint i = 0; i < GetNumberOfSides(part); i++)
1449 {
1450 if (tex.FaceTextures[i] != null)
1451 {
1452 texcolor = tex.FaceTextures[i].RGBA;
1453 texcolor.R = Util.Clip((float)color.x, 0.0f, 1.0f);
1454 texcolor.G = Util.Clip((float)color.y, 0.0f, 1.0f);
1455 texcolor.B = Util.Clip((float)color.z, 0.0f, 1.0f);
1456 tex.FaceTextures[i].RGBA = texcolor;
1457 }
1458 texcolor = tex.DefaultTexture.RGBA;
1459 texcolor.R = Util.Clip((float)color.x, 0.0f, 1.0f);
1460 texcolor.G = Util.Clip((float)color.y, 0.0f, 1.0f);
1461 texcolor.B = Util.Clip((float)color.z, 0.0f, 1.0f);
1462 tex.DefaultTexture.RGBA = texcolor;
1463 }
1464 part.UpdateTexture(tex);
1465 return;
1466 }
1467
1355 if (face == ScriptBaseClass.ALL_SIDES) 1468 if (face == ScriptBaseClass.ALL_SIDES)
1356 face = SceneObjectPart.ALL_SIDES; 1469 face = SceneObjectPart.ALL_SIDES;
1357 1470
@@ -1359,7 +1472,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1359 } 1472 }
1360 1473
1361 public void SetTexGen(SceneObjectPart part, int face,int style) 1474 public void SetTexGen(SceneObjectPart part, int face,int style)
1362 { 1475 {
1476 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1477 return;
1478
1363 Primitive.TextureEntry tex = part.Shape.Textures; 1479 Primitive.TextureEntry tex = part.Shape.Textures;
1364 MappingType textype; 1480 MappingType textype;
1365 textype = MappingType.Default; 1481 textype = MappingType.Default;
@@ -1389,7 +1505,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1389 } 1505 }
1390 1506
1391 public void SetGlow(SceneObjectPart part, int face, float glow) 1507 public void SetGlow(SceneObjectPart part, int face, float glow)
1392 { 1508 {
1509 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1510 return;
1511
1393 Primitive.TextureEntry tex = part.Shape.Textures; 1512 Primitive.TextureEntry tex = part.Shape.Textures;
1394 if (face >= 0 && face < GetNumberOfSides(part)) 1513 if (face >= 0 && face < GetNumberOfSides(part))
1395 { 1514 {
@@ -1414,7 +1533,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1414 } 1533 }
1415 1534
1416 public void SetShiny(SceneObjectPart part, int face, int shiny, Bumpiness bump) 1535 public void SetShiny(SceneObjectPart part, int face, int shiny, Bumpiness bump)
1417 { 1536 {
1537 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1538 return;
1418 1539
1419 Shininess sval = new Shininess(); 1540 Shininess sval = new Shininess();
1420 1541
@@ -1464,7 +1585,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1464 } 1585 }
1465 1586
1466 public void SetFullBright(SceneObjectPart part, int face, bool bright) 1587 public void SetFullBright(SceneObjectPart part, int face, bool bright)
1467 { 1588 {
1589 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1590 return;
1591
1468 Primitive.TextureEntry tex = part.Shape.Textures; 1592 Primitive.TextureEntry tex = part.Shape.Textures;
1469 if (face >= 0 && face < GetNumberOfSides(part)) 1593 if (face >= 0 && face < GetNumberOfSides(part))
1470 { 1594 {
@@ -1531,7 +1655,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1531 } 1655 }
1532 1656
1533 protected void SetAlpha(SceneObjectPart part, double alpha, int face) 1657 protected void SetAlpha(SceneObjectPart part, double alpha, int face)
1534 { 1658 {
1659 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1660 return;
1661
1535 Primitive.TextureEntry tex = part.Shape.Textures; 1662 Primitive.TextureEntry tex = part.Shape.Textures;
1536 Color4 texcolor; 1663 Color4 texcolor;
1537 if (face >= 0 && face < GetNumberOfSides(part)) 1664 if (face >= 0 && face < GetNumberOfSides(part))
@@ -1576,8 +1703,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1576 /// <param name="Force"></param> 1703 /// <param name="Force"></param>
1577 protected void SetFlexi(SceneObjectPart part, bool flexi, int softness, float gravity, float friction, 1704 protected void SetFlexi(SceneObjectPart part, bool flexi, int softness, float gravity, float friction,
1578 float wind, float tension, LSL_Vector Force) 1705 float wind, float tension, LSL_Vector Force)
1579 { 1706 {
1580 if (part == null) 1707 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1581 return; 1708 return;
1582 1709
1583 if (flexi) 1710 if (flexi)
@@ -1611,8 +1738,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1611 /// <param name="radius"></param> 1738 /// <param name="radius"></param>
1612 /// <param name="falloff"></param> 1739 /// <param name="falloff"></param>
1613 protected void SetPointLight(SceneObjectPart part, bool light, LSL_Vector color, float intensity, float radius, float falloff) 1740 protected void SetPointLight(SceneObjectPart part, bool light, LSL_Vector color, float intensity, float radius, float falloff)
1614 { 1741 {
1615 if (part == null) 1742 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1616 return; 1743 return;
1617 1744
1618 if (light) 1745 if (light)
@@ -1697,7 +1824,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1697 } 1824 }
1698 1825
1699 protected void SetTexture(SceneObjectPart part, string texture, int face) 1826 protected void SetTexture(SceneObjectPart part, string texture, int face)
1700 { 1827 {
1828 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1829 return;
1830
1701 UUID textureID=new UUID(); 1831 UUID textureID=new UUID();
1702 1832
1703 if (!UUID.TryParse(texture, out textureID)) 1833 if (!UUID.TryParse(texture, out textureID))
@@ -1742,7 +1872,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1742 } 1872 }
1743 1873
1744 protected void ScaleTexture(SceneObjectPart part, double u, double v, int face) 1874 protected void ScaleTexture(SceneObjectPart part, double u, double v, int face)
1745 { 1875 {
1876 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1877 return;
1878
1746 Primitive.TextureEntry tex = part.Shape.Textures; 1879 Primitive.TextureEntry tex = part.Shape.Textures;
1747 if (face >= 0 && face < GetNumberOfSides(part)) 1880 if (face >= 0 && face < GetNumberOfSides(part))
1748 { 1881 {
@@ -1778,7 +1911,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1778 } 1911 }
1779 1912
1780 protected void OffsetTexture(SceneObjectPart part, double u, double v, int face) 1913 protected void OffsetTexture(SceneObjectPart part, double u, double v, int face)
1781 { 1914 {
1915 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1916 return;
1917
1782 Primitive.TextureEntry tex = part.Shape.Textures; 1918 Primitive.TextureEntry tex = part.Shape.Textures;
1783 if (face >= 0 && face < GetNumberOfSides(part)) 1919 if (face >= 0 && face < GetNumberOfSides(part))
1784 { 1920 {
@@ -1814,7 +1950,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1814 } 1950 }
1815 1951
1816 protected void RotateTexture(SceneObjectPart part, double rotation, int face) 1952 protected void RotateTexture(SceneObjectPart part, double rotation, int face)
1817 { 1953 {
1954 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
1955 return;
1956
1818 Primitive.TextureEntry tex = part.Shape.Textures; 1957 Primitive.TextureEntry tex = part.Shape.Textures;
1819 if (face >= 0 && face < GetNumberOfSides(part)) 1958 if (face >= 0 && face < GetNumberOfSides(part))
1820 { 1959 {
@@ -1884,7 +2023,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1884 } 2023 }
1885 2024
1886 protected void SetPos(SceneObjectPart part, LSL_Vector targetPos) 2025 protected void SetPos(SceneObjectPart part, LSL_Vector targetPos)
1887 { 2026 {
2027 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2028 return;
2029
1888 // Capped movemment if distance > 10m (http://wiki.secondlife.com/wiki/LlSetPos) 2030 // Capped movemment if distance > 10m (http://wiki.secondlife.com/wiki/LlSetPos)
1889 LSL_Vector currentPos = llGetLocalPos(); 2031 LSL_Vector currentPos = llGetLocalPos();
1890 2032
@@ -1978,7 +2120,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1978 } 2120 }
1979 2121
1980 protected void SetRot(SceneObjectPart part, Quaternion rot) 2122 protected void SetRot(SceneObjectPart part, Quaternion rot)
1981 { 2123 {
2124 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
2125 return;
2126
1982 part.UpdateRotation(rot); 2127 part.UpdateRotation(rot);
1983 // Update rotation does not move the object in the physics scene if it's a linkset. 2128 // Update rotation does not move the object in the physics scene if it's a linkset.
1984 2129
@@ -2598,12 +2743,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2598 2743
2599 m_host.AddScriptLPS(1); 2744 m_host.AddScriptLPS(1);
2600 2745
2746 m_host.TaskInventory.LockItemsForRead(true);
2601 TaskInventoryItem item = m_host.TaskInventory[invItemID]; 2747 TaskInventoryItem item = m_host.TaskInventory[invItemID];
2602 2748 m_host.TaskInventory.LockItemsForRead(false);
2603 lock (m_host.TaskInventory)
2604 {
2605 item = m_host.TaskInventory[invItemID];
2606 }
2607 2749
2608 if (item.PermsGranter == UUID.Zero) 2750 if (item.PermsGranter == UUID.Zero)
2609 return 0; 2751 return 0;
@@ -2678,6 +2820,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2678 if (dist > m_ScriptDistanceFactor * 10.0f) 2820 if (dist > m_ScriptDistanceFactor * 10.0f)
2679 return; 2821 return;
2680 2822
2823 //Clone is thread-safe
2681 TaskInventoryDictionary partInventory = (TaskInventoryDictionary)m_host.TaskInventory.Clone(); 2824 TaskInventoryDictionary partInventory = (TaskInventoryDictionary)m_host.TaskInventory.Clone();
2682 2825
2683 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in partInventory) 2826 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in partInventory)
@@ -2762,6 +2905,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2762 // Orient the object to the angle calculated 2905 // Orient the object to the angle calculated
2763 //llSetRot(rot); 2906 //llSetRot(rot);
2764 } 2907 }
2908
2909 public void llRotLookAt(LSL_Rotation target, double strength, double damping)
2910 {
2911 m_host.AddScriptLPS(1);
2912// NotImplemented("llRotLookAt");
2913 m_host.RotLookAt(Rot2Quaternion(target), (float)strength, (float)damping);
2914
2915 }
2765 2916
2766 public void llStopLookAt() 2917 public void llStopLookAt()
2767 { 2918 {
@@ -2809,13 +2960,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2809 { 2960 {
2810 TaskInventoryItem item; 2961 TaskInventoryItem item;
2811 2962
2812 lock (m_host.TaskInventory) 2963 m_host.TaskInventory.LockItemsForRead(true);
2964 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
2813 { 2965 {
2814 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 2966 m_host.TaskInventory.LockItemsForRead(false);
2815 return; 2967 return;
2816 else 2968 }
2817 item = m_host.TaskInventory[InventorySelf()]; 2969 else
2970 {
2971 item = m_host.TaskInventory[InventorySelf()];
2818 } 2972 }
2973 m_host.TaskInventory.LockItemsForRead(false);
2819 2974
2820 if (item.PermsGranter != UUID.Zero) 2975 if (item.PermsGranter != UUID.Zero)
2821 { 2976 {
@@ -2837,13 +2992,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2837 { 2992 {
2838 TaskInventoryItem item; 2993 TaskInventoryItem item;
2839 2994
2995 m_host.TaskInventory.LockItemsForRead(true);
2840 lock (m_host.TaskInventory) 2996 lock (m_host.TaskInventory)
2841 { 2997 {
2998
2842 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 2999 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
3000 {
3001 m_host.TaskInventory.LockItemsForRead(false);
2843 return; 3002 return;
3003 }
2844 else 3004 else
3005 {
2845 item = m_host.TaskInventory[InventorySelf()]; 3006 item = m_host.TaskInventory[InventorySelf()];
3007 }
2846 } 3008 }
3009 m_host.TaskInventory.LockItemsForRead(false);
2847 3010
2848 m_host.AddScriptLPS(1); 3011 m_host.AddScriptLPS(1);
2849 3012
@@ -2880,13 +3043,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2880 3043
2881 TaskInventoryItem item; 3044 TaskInventoryItem item;
2882 3045
2883 lock (m_host.TaskInventory) 3046 m_host.TaskInventory.LockItemsForRead(true);
3047
3048 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
2884 { 3049 {
2885 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3050 m_host.TaskInventory.LockItemsForRead(false);
2886 return; 3051 return;
2887 else
2888 item = m_host.TaskInventory[InventorySelf()];
2889 } 3052 }
3053 else
3054 {
3055 item = m_host.TaskInventory[InventorySelf()];
3056 }
3057
3058 m_host.TaskInventory.LockItemsForRead(false);
2890 3059
2891 if (item.PermsGranter != m_host.OwnerID) 3060 if (item.PermsGranter != m_host.OwnerID)
2892 return; 3061 return;
@@ -2912,13 +3081,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2912 3081
2913 TaskInventoryItem item; 3082 TaskInventoryItem item;
2914 3083
2915 lock (m_host.TaskInventory) 3084 m_host.TaskInventory.LockItemsForRead(true);
3085
3086 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
2916 { 3087 {
2917 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3088 m_host.TaskInventory.LockItemsForRead(false);
2918 return; 3089 return;
2919 else
2920 item = m_host.TaskInventory[InventorySelf()];
2921 } 3090 }
3091 else
3092 {
3093 item = m_host.TaskInventory[InventorySelf()];
3094 }
3095 m_host.TaskInventory.LockItemsForRead(false);
3096
2922 3097
2923 if (item.PermsGranter != m_host.OwnerID) 3098 if (item.PermsGranter != m_host.OwnerID)
2924 return; 3099 return;
@@ -2954,8 +3129,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2954 return m_host.OwnerID.ToString(); 3129 return m_host.OwnerID.ToString();
2955 } 3130 }
2956 3131
3132 [DebuggerNonUserCode]
2957 public void llInstantMessage(string user, string message) 3133 public void llInstantMessage(string user, string message)
2958 { 3134 {
3135 UUID result;
3136 if (!UUID.TryParse(user, out result))
3137 {
3138 throw new Exception(String.Format("An invalid key of '{0} was passed to llInstantMessage", user));
3139 return;
3140 }
3141
3142
2959 m_host.AddScriptLPS(1); 3143 m_host.AddScriptLPS(1);
2960 3144
2961 // We may be able to use ClientView.SendInstantMessage here, but we need a client instance. 3145 // We may be able to use ClientView.SendInstantMessage here, but we need a client instance.
@@ -2970,7 +3154,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2970 UUID friendTransactionID = UUID.Random(); 3154 UUID friendTransactionID = UUID.Random();
2971 3155
2972 //m_pendingFriendRequests.Add(friendTransactionID, fromAgentID); 3156 //m_pendingFriendRequests.Add(friendTransactionID, fromAgentID);
2973 3157
2974 GridInstantMessage msg = new GridInstantMessage(); 3158 GridInstantMessage msg = new GridInstantMessage();
2975 msg.fromAgentID = new Guid(m_host.UUID.ToString()); // fromAgentID.Guid; 3159 msg.fromAgentID = new Guid(m_host.UUID.ToString()); // fromAgentID.Guid;
2976 msg.toAgentID = new Guid(user); // toAgentID.Guid; 3160 msg.toAgentID = new Guid(user); // toAgentID.Guid;
@@ -3119,13 +3303,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3119 m_host.AddScriptLPS(1); 3303 m_host.AddScriptLPS(1);
3120 } 3304 }
3121 3305
3122 public void llRotLookAt(LSL_Rotation target, double strength, double damping)
3123 {
3124 m_host.AddScriptLPS(1);
3125 Quaternion rot = new Quaternion((float)target.x, (float)target.y, (float)target.z, (float)target.s);
3126 m_host.RotLookAt(rot, (float)strength, (float)damping);
3127 }
3128
3129 public LSL_Integer llStringLength(string str) 3306 public LSL_Integer llStringLength(string str)
3130 { 3307 {
3131 m_host.AddScriptLPS(1); 3308 m_host.AddScriptLPS(1);
@@ -3149,14 +3326,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3149 3326
3150 TaskInventoryItem item; 3327 TaskInventoryItem item;
3151 3328
3152 lock (m_host.TaskInventory) 3329 m_host.TaskInventory.LockItemsForRead(true);
3330 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
3153 { 3331 {
3154 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3332 m_host.TaskInventory.LockItemsForRead(false);
3155 return; 3333 return;
3156 else
3157 item = m_host.TaskInventory[InventorySelf()];
3158 } 3334 }
3159 3335 else
3336 {
3337 item = m_host.TaskInventory[InventorySelf()];
3338 }
3339 m_host.TaskInventory.LockItemsForRead(false);
3160 if (item.PermsGranter == UUID.Zero) 3340 if (item.PermsGranter == UUID.Zero)
3161 return; 3341 return;
3162 3342
@@ -3186,13 +3366,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3186 3366
3187 TaskInventoryItem item; 3367 TaskInventoryItem item;
3188 3368
3189 lock (m_host.TaskInventory) 3369 m_host.TaskInventory.LockItemsForRead(true);
3370 if (!m_host.TaskInventory.ContainsKey(InventorySelf()))
3190 { 3371 {
3191 if (!m_host.TaskInventory.ContainsKey(InventorySelf())) 3372 m_host.TaskInventory.LockItemsForRead(false);
3192 return; 3373 return;
3193 else
3194 item = m_host.TaskInventory[InventorySelf()];
3195 } 3374 }
3375 else
3376 {
3377 item = m_host.TaskInventory[InventorySelf()];
3378 }
3379 m_host.TaskInventory.LockItemsForRead(false);
3380
3196 3381
3197 if (item.PermsGranter == UUID.Zero) 3382 if (item.PermsGranter == UUID.Zero)
3198 return; 3383 return;
@@ -3269,10 +3454,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3269 3454
3270 TaskInventoryItem item; 3455 TaskInventoryItem item;
3271 3456
3272 lock (m_host.TaskInventory) 3457
3458 m_host.TaskInventory.LockItemsForRead(true);
3459 if (!m_host.TaskInventory.ContainsKey(invItemID))
3460 {
3461 m_host.TaskInventory.LockItemsForRead(false);
3462 return;
3463 }
3464 else
3273 { 3465 {
3274 item = m_host.TaskInventory[invItemID]; 3466 item = m_host.TaskInventory[invItemID];
3275 } 3467 }
3468 m_host.TaskInventory.LockItemsForRead(false);
3276 3469
3277 if (agentID == UUID.Zero || perm == 0) // Releasing permissions 3470 if (agentID == UUID.Zero || perm == 0) // Releasing permissions
3278 { 3471 {
@@ -3304,11 +3497,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3304 3497
3305 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms 3498 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms
3306 { 3499 {
3307 lock (m_host.TaskInventory) 3500 m_host.TaskInventory.LockItemsForWrite(true);
3308 { 3501 m_host.TaskInventory[invItemID].PermsGranter = agentID;
3309 m_host.TaskInventory[invItemID].PermsGranter = agentID; 3502 m_host.TaskInventory[invItemID].PermsMask = perm;
3310 m_host.TaskInventory[invItemID].PermsMask = perm; 3503 m_host.TaskInventory.LockItemsForWrite(false);
3311 }
3312 3504
3313 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams( 3505 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams(
3314 "run_time_permissions", new Object[] { 3506 "run_time_permissions", new Object[] {
@@ -3328,11 +3520,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3328 3520
3329 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms 3521 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms
3330 { 3522 {
3331 lock (m_host.TaskInventory) 3523 m_host.TaskInventory.LockItemsForWrite(true);
3332 { 3524 m_host.TaskInventory[invItemID].PermsGranter = agentID;
3333 m_host.TaskInventory[invItemID].PermsGranter = agentID; 3525 m_host.TaskInventory[invItemID].PermsMask = perm;
3334 m_host.TaskInventory[invItemID].PermsMask = perm; 3526 m_host.TaskInventory.LockItemsForWrite(false);
3335 }
3336 3527
3337 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams( 3528 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams(
3338 "run_time_permissions", new Object[] { 3529 "run_time_permissions", new Object[] {
@@ -3353,11 +3544,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3353 3544
3354 if (!m_waitingForScriptAnswer) 3545 if (!m_waitingForScriptAnswer)
3355 { 3546 {
3356 lock (m_host.TaskInventory) 3547 m_host.TaskInventory.LockItemsForWrite(true);
3357 { 3548 m_host.TaskInventory[invItemID].PermsGranter = agentID;
3358 m_host.TaskInventory[invItemID].PermsGranter = agentID; 3549 m_host.TaskInventory[invItemID].PermsMask = 0;
3359 m_host.TaskInventory[invItemID].PermsMask = 0; 3550 m_host.TaskInventory.LockItemsForWrite(false);
3360 }
3361 3551
3362 presence.ControllingClient.OnScriptAnswer += handleScriptAnswer; 3552 presence.ControllingClient.OnScriptAnswer += handleScriptAnswer;
3363 m_waitingForScriptAnswer=true; 3553 m_waitingForScriptAnswer=true;
@@ -3392,10 +3582,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3392 if ((answer & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0) 3582 if ((answer & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) == 0)
3393 llReleaseControls(); 3583 llReleaseControls();
3394 3584
3395 lock (m_host.TaskInventory) 3585
3396 { 3586 m_host.TaskInventory.LockItemsForWrite(true);
3397 m_host.TaskInventory[invItemID].PermsMask = answer; 3587 m_host.TaskInventory[invItemID].PermsMask = answer;
3398 } 3588 m_host.TaskInventory.LockItemsForWrite(false);
3589
3399 3590
3400 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams( 3591 m_ScriptEngine.PostScriptEvent(m_itemID, new EventParams(
3401 "run_time_permissions", new Object[] { 3592 "run_time_permissions", new Object[] {
@@ -3407,16 +3598,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3407 { 3598 {
3408 m_host.AddScriptLPS(1); 3599 m_host.AddScriptLPS(1);
3409 3600
3410 lock (m_host.TaskInventory) 3601 m_host.TaskInventory.LockItemsForRead(true);
3602
3603 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
3411 { 3604 {
3412 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 3605 if (item.Type == 10 && item.ItemID == m_itemID)
3413 { 3606 {
3414 if (item.Type == 10 && item.ItemID == m_itemID) 3607 m_host.TaskInventory.LockItemsForRead(false);
3415 { 3608 return item.PermsGranter.ToString();
3416 return item.PermsGranter.ToString();
3417 }
3418 } 3609 }
3419 } 3610 }
3611 m_host.TaskInventory.LockItemsForRead(false);
3420 3612
3421 return UUID.Zero.ToString(); 3613 return UUID.Zero.ToString();
3422 } 3614 }
@@ -3425,19 +3617,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3425 { 3617 {
3426 m_host.AddScriptLPS(1); 3618 m_host.AddScriptLPS(1);
3427 3619
3428 lock (m_host.TaskInventory) 3620 m_host.TaskInventory.LockItemsForRead(true);
3621
3622 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
3429 { 3623 {
3430 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 3624 if (item.Type == 10 && item.ItemID == m_itemID)
3431 { 3625 {
3432 if (item.Type == 10 && item.ItemID == m_itemID) 3626 int perms = item.PermsMask;
3433 { 3627 if (m_automaticLinkPermission)
3434 int perms = item.PermsMask; 3628 perms |= ScriptBaseClass.PERMISSION_CHANGE_LINKS;
3435 if (m_automaticLinkPermission) 3629 m_host.TaskInventory.LockItemsForRead(false);
3436 perms |= ScriptBaseClass.PERMISSION_CHANGE_LINKS; 3630 return perms;
3437 return perms;
3438 }
3439 } 3631 }
3440 } 3632 }
3633 m_host.TaskInventory.LockItemsForRead(false);
3441 3634
3442 return 0; 3635 return 0;
3443 } 3636 }
@@ -3470,11 +3663,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3470 UUID invItemID = InventorySelf(); 3663 UUID invItemID = InventorySelf();
3471 3664
3472 TaskInventoryItem item; 3665 TaskInventoryItem item;
3473 lock (m_host.TaskInventory) 3666 m_host.TaskInventory.LockItemsForRead(true);
3474 { 3667 item = m_host.TaskInventory[invItemID];
3475 item = m_host.TaskInventory[invItemID]; 3668 m_host.TaskInventory.LockItemsForRead(false);
3476 } 3669
3477
3478 if ((item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0 3670 if ((item.PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
3479 && !m_automaticLinkPermission) 3671 && !m_automaticLinkPermission)
3480 { 3672 {
@@ -3527,16 +3719,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3527 m_host.AddScriptLPS(1); 3719 m_host.AddScriptLPS(1);
3528 UUID invItemID = InventorySelf(); 3720 UUID invItemID = InventorySelf();
3529 3721
3530 lock (m_host.TaskInventory) 3722 m_host.TaskInventory.LockItemsForRead(true);
3531 {
3532 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0 3723 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CHANGE_LINKS) == 0
3533 && !m_automaticLinkPermission) 3724 && !m_automaticLinkPermission)
3534 { 3725 {
3535 ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!"); 3726 ShoutError("Script trying to link but PERMISSION_CHANGE_LINKS permission not set!");
3727 m_host.TaskInventory.LockItemsForRead(false);
3536 return; 3728 return;
3537 } 3729 }
3538 } 3730 m_host.TaskInventory.LockItemsForRead(false);
3539 3731
3540 if (linknum < ScriptBaseClass.LINK_THIS) 3732 if (linknum < ScriptBaseClass.LINK_THIS)
3541 return; 3733 return;
3542 3734
@@ -3713,17 +3905,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3713 m_host.AddScriptLPS(1); 3905 m_host.AddScriptLPS(1);
3714 int count = 0; 3906 int count = 0;
3715 3907
3716 lock (m_host.TaskInventory) 3908 m_host.TaskInventory.LockItemsForRead(true);
3909 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
3717 { 3910 {
3718 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 3911 if (inv.Value.Type == type || type == -1)
3719 { 3912 {
3720 if (inv.Value.Type == type || type == -1) 3913 count = count + 1;
3721 {
3722 count = count + 1;
3723 }
3724 } 3914 }
3725 } 3915 }
3726 3916
3917 m_host.TaskInventory.LockItemsForRead(false);
3727 return count; 3918 return count;
3728 } 3919 }
3729 3920
@@ -3732,16 +3923,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3732 m_host.AddScriptLPS(1); 3923 m_host.AddScriptLPS(1);
3733 ArrayList keys = new ArrayList(); 3924 ArrayList keys = new ArrayList();
3734 3925
3735 lock (m_host.TaskInventory) 3926 m_host.TaskInventory.LockItemsForRead(true);
3927 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
3736 { 3928 {
3737 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 3929 if (inv.Value.Type == type || type == -1)
3738 { 3930 {
3739 if (inv.Value.Type == type || type == -1) 3931 keys.Add(inv.Value.Name);
3740 {
3741 keys.Add(inv.Value.Name);
3742 }
3743 } 3932 }
3744 } 3933 }
3934 m_host.TaskInventory.LockItemsForRead(false);
3745 3935
3746 if (keys.Count == 0) 3936 if (keys.Count == 0)
3747 { 3937 {
@@ -3778,20 +3968,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3778 } 3968 }
3779 3969
3780 // move the first object found with this inventory name 3970 // move the first object found with this inventory name
3781 lock (m_host.TaskInventory) 3971 m_host.TaskInventory.LockItemsForRead(true);
3972 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
3782 { 3973 {
3783 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 3974 if (inv.Value.Name == inventory)
3784 { 3975 {
3785 if (inv.Value.Name == inventory) 3976 found = true;
3786 { 3977 objId = inv.Key;
3787 found = true; 3978 assetType = inv.Value.Type;
3788 objId = inv.Key; 3979 objName = inv.Value.Name;
3789 assetType = inv.Value.Type; 3980 break;
3790 objName = inv.Value.Name;
3791 break;
3792 }
3793 } 3981 }
3794 } 3982 }
3983 m_host.TaskInventory.LockItemsForRead(false);
3795 3984
3796 if (!found) 3985 if (!found)
3797 { 3986 {
@@ -3836,24 +4025,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3836 ScriptSleep(3000); 4025 ScriptSleep(3000);
3837 } 4026 }
3838 4027
4028 [DebuggerNonUserCode]
3839 public void llRemoveInventory(string name) 4029 public void llRemoveInventory(string name)
3840 { 4030 {
3841 m_host.AddScriptLPS(1); 4031 m_host.AddScriptLPS(1);
3842 4032
3843 lock (m_host.TaskInventory) 4033 m_host.TaskInventory.LockItemsForRead(true);
4034 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
3844 { 4035 {
3845 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 4036 if (item.Name == name)
3846 { 4037 {
3847 if (item.Name == name) 4038 if (item.ItemID == m_itemID)
3848 { 4039 throw new ScriptDeleteException();
3849 if (item.ItemID == m_itemID) 4040 else
3850 throw new ScriptDeleteException(); 4041 m_host.Inventory.RemoveInventoryItem(item.ItemID);
3851 else 4042
3852 m_host.Inventory.RemoveInventoryItem(item.ItemID); 4043 m_host.TaskInventory.LockItemsForRead(false);
3853 return; 4044 return;
3854 }
3855 } 4045 }
3856 } 4046 }
4047 m_host.TaskInventory.LockItemsForRead(false);
3857 } 4048 }
3858 4049
3859 public void llSetText(string text, LSL_Vector color, double alpha) 4050 public void llSetText(string text, LSL_Vector color, double alpha)
@@ -3942,6 +4133,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3942 { 4133 {
3943 m_host.AddScriptLPS(1); 4134 m_host.AddScriptLPS(1);
3944 4135
4136 //Clone is thread safe
3945 TaskInventoryDictionary itemDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone(); 4137 TaskInventoryDictionary itemDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone();
3946 4138
3947 foreach (TaskInventoryItem item in itemDictionary.Values) 4139 foreach (TaskInventoryItem item in itemDictionary.Values)
@@ -4030,17 +4222,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4030 UUID soundId = UUID.Zero; 4222 UUID soundId = UUID.Zero;
4031 if (!UUID.TryParse(impact_sound, out soundId)) 4223 if (!UUID.TryParse(impact_sound, out soundId))
4032 { 4224 {
4033 lock (m_host.TaskInventory) 4225 m_host.TaskInventory.LockItemsForRead(true);
4226 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
4034 { 4227 {
4035 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 4228 if (item.Type == (int)AssetType.Sound && item.Name == impact_sound)
4036 { 4229 {
4037 if (item.Type == (int)AssetType.Sound && item.Name == impact_sound) 4230 soundId = item.AssetID;
4038 { 4231 break;
4039 soundId = item.AssetID;
4040 break;
4041 }
4042 } 4232 }
4043 } 4233 }
4234 m_host.TaskInventory.LockItemsForRead(false);
4044 } 4235 }
4045 m_host.CollisionSound = soundId; 4236 m_host.CollisionSound = soundId;
4046 m_host.CollisionSoundVolume = (float)impact_volume; 4237 m_host.CollisionSoundVolume = (float)impact_volume;
@@ -4086,6 +4277,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4086 UUID partItemID; 4277 UUID partItemID;
4087 foreach (SceneObjectPart part in parts) 4278 foreach (SceneObjectPart part in parts)
4088 { 4279 {
4280 //Clone is thread safe
4089 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)part.TaskInventory.Clone(); 4281 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)part.TaskInventory.Clone();
4090 4282
4091 foreach (TaskInventoryItem item in itemsDictionary.Values) 4283 foreach (TaskInventoryItem item in itemsDictionary.Values)
@@ -4300,17 +4492,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4300 4492
4301 m_host.AddScriptLPS(1); 4493 m_host.AddScriptLPS(1);
4302 4494
4303 lock (m_host.TaskInventory) 4495 m_host.TaskInventory.LockItemsForRead(true);
4496 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
4304 { 4497 {
4305 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 4498 if (item.Type == 10 && item.ItemID == m_itemID)
4306 { 4499 {
4307 if (item.Type == 10 && item.ItemID == m_itemID) 4500 result = item.Name!=null?item.Name:String.Empty;
4308 { 4501 break;
4309 result = item.Name != null ? item.Name : String.Empty;
4310 break;
4311 }
4312 } 4502 }
4313 } 4503 }
4504 m_host.TaskInventory.LockItemsForRead(false);
4314 4505
4315 return result; 4506 return result;
4316 } 4507 }
@@ -4463,23 +4654,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4463 { 4654 {
4464 m_host.AddScriptLPS(1); 4655 m_host.AddScriptLPS(1);
4465 4656
4466 lock (m_host.TaskInventory) 4657 m_host.TaskInventory.LockItemsForRead(true);
4658 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
4467 { 4659 {
4468 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 4660 if (inv.Value.Name == name)
4469 { 4661 {
4470 if (inv.Value.Name == name) 4662 if ((inv.Value.CurrentPermissions & (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) == (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify))
4471 { 4663 {
4472 if ((inv.Value.CurrentPermissions & (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) == (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify)) 4664 m_host.TaskInventory.LockItemsForRead(false);
4473 { 4665 return inv.Value.AssetID.ToString();
4474 return inv.Value.AssetID.ToString(); 4666 }
4475 } 4667 else
4476 else 4668 {
4477 { 4669 m_host.TaskInventory.LockItemsForRead(false);
4478 return UUID.Zero.ToString(); 4670 return UUID.Zero.ToString();
4479 }
4480 } 4671 }
4481 } 4672 }
4482 } 4673 }
4674 m_host.TaskInventory.LockItemsForRead(false);
4483 4675
4484 return UUID.Zero.ToString(); 4676 return UUID.Zero.ToString();
4485 } 4677 }
@@ -5995,14 +6187,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5995 6187
5996 protected UUID GetTaskInventoryItem(string name) 6188 protected UUID GetTaskInventoryItem(string name)
5997 { 6189 {
5998 lock (m_host.TaskInventory) 6190 m_host.TaskInventory.LockItemsForRead(true);
6191 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
5999 { 6192 {
6000 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 6193 if (inv.Value.Name == name)
6001 { 6194 {
6002 if (inv.Value.Name == name) 6195 m_host.TaskInventory.LockItemsForRead(false);
6003 return inv.Key; 6196 return inv.Key;
6004 } 6197 }
6005 } 6198 }
6199 m_host.TaskInventory.LockItemsForRead(false);
6006 6200
6007 return UUID.Zero; 6201 return UUID.Zero;
6008 } 6202 }
@@ -6330,22 +6524,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6330 } 6524 }
6331 6525
6332 // copy the first script found with this inventory name 6526 // copy the first script found with this inventory name
6333 lock (m_host.TaskInventory) 6527 m_host.TaskInventory.LockItemsForRead(true);
6528 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
6334 { 6529 {
6335 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 6530 if (inv.Value.Name == name)
6336 { 6531 {
6337 if (inv.Value.Name == name) 6532 // make sure the object is a script
6533 if (10 == inv.Value.Type)
6338 { 6534 {
6339 // make sure the object is a script 6535 found = true;
6340 if (10 == inv.Value.Type) 6536 srcId = inv.Key;
6341 { 6537 break;
6342 found = true;
6343 srcId = inv.Key;
6344 break;
6345 }
6346 } 6538 }
6347 } 6539 }
6348 } 6540 }
6541 m_host.TaskInventory.LockItemsForRead(false);
6349 6542
6350 if (!found) 6543 if (!found)
6351 { 6544 {
@@ -6427,8 +6620,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6427 } 6620 }
6428 6621
6429 protected ObjectShapePacket.ObjectDataBlock SetPrimitiveBlockShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist) 6622 protected ObjectShapePacket.ObjectDataBlock SetPrimitiveBlockShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist)
6430 { 6623 {
6431 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock(); 6624 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock();
6625 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
6626 return shapeBlock;
6432 6627
6433 if (holeshape != (int)ScriptBaseClass.PRIM_HOLE_DEFAULT && 6628 if (holeshape != (int)ScriptBaseClass.PRIM_HOLE_DEFAULT &&
6434 holeshape != (int)ScriptBaseClass.PRIM_HOLE_CIRCLE && 6629 holeshape != (int)ScriptBaseClass.PRIM_HOLE_CIRCLE &&
@@ -6498,7 +6693,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6498 } 6693 }
6499 6694
6500 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector taper_b, LSL_Vector topshear, byte fudge) 6695 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector taper_b, LSL_Vector topshear, byte fudge)
6501 { 6696 {
6697 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
6698 return;
6699
6502 ObjectShapePacket.ObjectDataBlock shapeBlock; 6700 ObjectShapePacket.ObjectDataBlock shapeBlock;
6503 6701
6504 shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist); 6702 shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist);
@@ -6547,7 +6745,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6547 } 6745 }
6548 6746
6549 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector dimple, byte fudge) 6747 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector dimple, byte fudge)
6550 { 6748 {
6749 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
6750 return;
6751
6551 ObjectShapePacket.ObjectDataBlock shapeBlock; 6752 ObjectShapePacket.ObjectDataBlock shapeBlock;
6552 6753
6553 shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist); 6754 shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist);
@@ -6589,7 +6790,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6589 } 6790 }
6590 6791
6591 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector holesize, LSL_Vector topshear, LSL_Vector profilecut, LSL_Vector taper_a, float revolutions, float radiusoffset, float skew, byte fudge) 6792 protected void SetPrimitiveShapeParams(SceneObjectPart part, int holeshape, LSL_Vector cut, float hollow, LSL_Vector twist, LSL_Vector holesize, LSL_Vector topshear, LSL_Vector profilecut, LSL_Vector taper_a, float revolutions, float radiusoffset, float skew, byte fudge)
6592 { 6793 {
6794 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
6795 return;
6796
6593 ObjectShapePacket.ObjectDataBlock shapeBlock; 6797 ObjectShapePacket.ObjectDataBlock shapeBlock;
6594 6798
6595 shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist); 6799 shapeBlock = SetPrimitiveBlockShapeParams(part, holeshape, cut, hollow, twist);
@@ -6710,7 +6914,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6710 } 6914 }
6711 6915
6712 protected void SetPrimitiveShapeParams(SceneObjectPart part, string map, int type) 6916 protected void SetPrimitiveShapeParams(SceneObjectPart part, string map, int type)
6713 { 6917 {
6918 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
6919 return;
6920
6714 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock(); 6921 ObjectShapePacket.ObjectDataBlock shapeBlock = new ObjectShapePacket.ObjectDataBlock();
6715 UUID sculptId; 6922 UUID sculptId;
6716 6923
@@ -6744,14 +6951,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6744 } 6951 }
6745 6952
6746 public void llSetPrimitiveParams(LSL_List rules) 6953 public void llSetPrimitiveParams(LSL_List rules)
6747 { 6954 {
6748 m_host.AddScriptLPS(1); 6955 m_host.AddScriptLPS(1);
6749 SetPrimParams(m_host, rules); 6956 SetPrimParams(m_host, rules);
6750 } 6957 }
6751 6958
6752 public void llSetLinkPrimitiveParams(int linknumber, LSL_List rules) 6959 public void llSetLinkPrimitiveParams(int linknumber, LSL_List rules)
6753 { 6960 {
6754 m_host.AddScriptLPS(1); 6961 m_host.AddScriptLPS(1);
6755 6962
6756 List<SceneObjectPart> parts = GetLinkParts(linknumber); 6963 List<SceneObjectPart> parts = GetLinkParts(linknumber);
6757 6964
@@ -6760,7 +6967,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
6760 } 6967 }
6761 6968
6762 protected void SetPrimParams(SceneObjectPart part, LSL_List rules) 6969 protected void SetPrimParams(SceneObjectPart part, LSL_List rules)
6763 { 6970 {
6971 if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
6972 return;
6973
6764 int idx = 0; 6974 int idx = 0;
6765 6975
6766 while (idx < rules.Length) 6976 while (idx < rules.Length)
@@ -7562,25 +7772,96 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7562 } 7772 }
7563 break; 7773 break;
7564 7774
7565 case (int)ScriptBaseClass.PRIM_BUMP_SHINY: 7775 case (int)ScriptBaseClass.PRIM_BUMP_SHINY:
7566 // TODO-------------- 7776 if (remain < 1)
7567 if (remain < 1) 7777 return res;
7568 return res; 7778 face = (int)rules.GetLSLIntegerItem(idx++);
7569 7779
7570 face=(int)rules.GetLSLIntegerItem(idx++); 7780 tex = part.Shape.Textures;
7571 7781 int shiny;
7572 res.Add(new LSL_Integer(0)); 7782 if (face == ScriptBaseClass.ALL_SIDES)
7573 res.Add(new LSL_Integer(0)); 7783 {
7784 for (face = 0; face < GetNumberOfSides(part); face++)
7785 {
7786 Shininess shinyness = tex.GetFace((uint)face).Shiny;
7787 if (shinyness == Shininess.High)
7788 {
7789 shiny = ScriptBaseClass.PRIM_SHINY_HIGH;
7790 }
7791 else if (shinyness == Shininess.Medium)
7792 {
7793 shiny = ScriptBaseClass.PRIM_SHINY_MEDIUM;
7794 }
7795 else if (shinyness == Shininess.Low)
7796 {
7797 shiny = ScriptBaseClass.PRIM_SHINY_LOW;
7798 }
7799 else
7800 {
7801 shiny = ScriptBaseClass.PRIM_SHINY_NONE;
7802 }
7803 res.Add(new LSL_Integer(shiny));
7804 res.Add(new LSL_Integer((int)tex.GetFace((uint)face).Bump));
7805 }
7806 }
7807 else
7808 {
7809 Shininess shinyness = tex.GetFace((uint)face).Shiny;
7810 if (shinyness == Shininess.High)
7811 {
7812 shiny = ScriptBaseClass.PRIM_SHINY_HIGH;
7813 }
7814 else if (shinyness == Shininess.Medium)
7815 {
7816 shiny = ScriptBaseClass.PRIM_SHINY_MEDIUM;
7817 }
7818 else if (shinyness == Shininess.Low)
7819 {
7820 shiny = ScriptBaseClass.PRIM_SHINY_LOW;
7821 }
7822 else
7823 {
7824 shiny = ScriptBaseClass.PRIM_SHINY_NONE;
7825 }
7826 res.Add(new LSL_Integer(shiny));
7827 res.Add(new LSL_Integer((int)tex.GetFace((uint)face).Bump));
7828 }
7574 break; 7829 break;
7575 7830
7576 case (int)ScriptBaseClass.PRIM_FULLBRIGHT: 7831 case (int)ScriptBaseClass.PRIM_FULLBRIGHT:
7577 // TODO-------------- 7832 if (remain < 1)
7578 if (remain < 1) 7833 return res;
7579 return res; 7834 face = (int)rules.GetLSLIntegerItem(idx++);
7580 7835
7581 face=(int)rules.GetLSLIntegerItem(idx++); 7836 tex = part.Shape.Textures;
7582 7837 int fullbright;
7583 res.Add(new LSL_Integer(0)); 7838 if (face == ScriptBaseClass.ALL_SIDES)
7839 {
7840 for (face = 0; face < GetNumberOfSides(part); face++)
7841 {
7842 if (tex.GetFace((uint)face).Fullbright == true)
7843 {
7844 fullbright = ScriptBaseClass.TRUE;
7845 }
7846 else
7847 {
7848 fullbright = ScriptBaseClass.FALSE;
7849 }
7850 res.Add(new LSL_Integer(fullbright));
7851 }
7852 }
7853 else
7854 {
7855 if (tex.GetFace((uint)face).Fullbright == true)
7856 {
7857 fullbright = ScriptBaseClass.TRUE;
7858 }
7859 else
7860 {
7861 fullbright = ScriptBaseClass.FALSE;
7862 }
7863 res.Add(new LSL_Integer(fullbright));
7864 }
7584 break; 7865 break;
7585 7866
7586 case (int)ScriptBaseClass.PRIM_FLEXIBLE: 7867 case (int)ScriptBaseClass.PRIM_FLEXIBLE:
@@ -7601,14 +7882,37 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7601 break; 7882 break;
7602 7883
7603 case (int)ScriptBaseClass.PRIM_TEXGEN: 7884 case (int)ScriptBaseClass.PRIM_TEXGEN:
7604 // TODO-------------- 7885 // (PRIM_TEXGEN_DEFAULT, PRIM_TEXGEN_PLANAR)
7605 // (PRIM_TEXGEN_DEFAULT, PRIM_TEXGEN_PLANAR) 7886 if (remain < 1)
7606 if (remain < 1) 7887 return res;
7607 return res; 7888 face = (int)rules.GetLSLIntegerItem(idx++);
7608 7889
7609 face=(int)rules.GetLSLIntegerItem(idx++); 7890 tex = part.Shape.Textures;
7610 7891 if (face == ScriptBaseClass.ALL_SIDES)
7611 res.Add(new LSL_Integer(0)); 7892 {
7893 for (face = 0; face < GetNumberOfSides(part); face++)
7894 {
7895 if (tex.GetFace((uint)face).TexMapType == MappingType.Planar)
7896 {
7897 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_PLANAR));
7898 }
7899 else
7900 {
7901 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_DEFAULT));
7902 }
7903 }
7904 }
7905 else
7906 {
7907 if (tex.GetFace((uint)face).TexMapType == MappingType.Planar)
7908 {
7909 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_PLANAR));
7910 }
7911 else
7912 {
7913 res.Add(new LSL_Integer(ScriptBaseClass.PRIM_TEXGEN_DEFAULT));
7914 }
7915 }
7612 break; 7916 break;
7613 7917
7614 case (int)ScriptBaseClass.PRIM_POINT_LIGHT: 7918 case (int)ScriptBaseClass.PRIM_POINT_LIGHT:
@@ -7626,14 +7930,26 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7626 res.Add(new LSL_Float(shape.LightFalloff)); // falloff 7930 res.Add(new LSL_Float(shape.LightFalloff)); // falloff
7627 break; 7931 break;
7628 7932
7629 case (int)ScriptBaseClass.PRIM_GLOW: 7933 case (int)ScriptBaseClass.PRIM_GLOW:
7630 // TODO-------------- 7934 if (remain < 1)
7631 if (remain < 1)
7632 return res; 7935 return res;
7633 7936 face = (int)rules.GetLSLIntegerItem(idx++);
7634 face=(int)rules.GetLSLIntegerItem(idx++); 7937
7635 7938 tex = part.Shape.Textures;
7636 res.Add(new LSL_Float(0)); 7939 float primglow;
7940 if (face == ScriptBaseClass.ALL_SIDES)
7941 {
7942 for (face = 0; face < GetNumberOfSides(part); face++)
7943 {
7944 primglow = tex.GetFace((uint)face).Glow;
7945 res.Add(new LSL_Float(primglow));
7946 }
7947 }
7948 else
7949 {
7950 primglow = tex.GetFace((uint)face).Glow;
7951 res.Add(new LSL_Float(primglow));
7952 }
7637 break; 7953 break;
7638 } 7954 }
7639 } 7955 }
@@ -8162,28 +8478,28 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8162 { 8478 {
8163 m_host.AddScriptLPS(1); 8479 m_host.AddScriptLPS(1);
8164 8480
8165 lock (m_host.TaskInventory) 8481 m_host.TaskInventory.LockItemsForRead(true);
8482 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
8166 { 8483 {
8167 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 8484 if (inv.Value.Name == item)
8168 { 8485 {
8169 if (inv.Value.Name == item) 8486 m_host.TaskInventory.LockItemsForRead(false);
8487 switch (mask)
8170 { 8488 {
8171 switch (mask) 8489 case 0:
8172 { 8490 return (int)inv.Value.BasePermissions;
8173 case 0: 8491 case 1:
8174 return (int)inv.Value.BasePermissions; 8492 return (int)inv.Value.CurrentPermissions;
8175 case 1: 8493 case 2:
8176 return (int)inv.Value.CurrentPermissions; 8494 return (int)inv.Value.GroupPermissions;
8177 case 2: 8495 case 3:
8178 return (int)inv.Value.GroupPermissions; 8496 return (int)inv.Value.EveryonePermissions;
8179 case 3: 8497 case 4:
8180 return (int)inv.Value.EveryonePermissions; 8498 return (int)inv.Value.NextPermissions;
8181 case 4:
8182 return (int)inv.Value.NextPermissions;
8183 }
8184 } 8499 }
8185 } 8500 }
8186 } 8501 }
8502 m_host.TaskInventory.LockItemsForRead(false);
8187 8503
8188 return -1; 8504 return -1;
8189 } 8505 }
@@ -8230,16 +8546,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8230 { 8546 {
8231 m_host.AddScriptLPS(1); 8547 m_host.AddScriptLPS(1);
8232 8548
8233 lock (m_host.TaskInventory) 8549 m_host.TaskInventory.LockItemsForRead(true);
8550 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
8234 { 8551 {
8235 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 8552 if (inv.Value.Name == item)
8236 { 8553 {
8237 if (inv.Value.Name == item) 8554 m_host.TaskInventory.LockItemsForRead(false);
8238 { 8555 return inv.Value.CreatorID.ToString();
8239 return inv.Value.CreatorID.ToString();
8240 }
8241 } 8556 }
8242 } 8557 }
8558 m_host.TaskInventory.LockItemsForRead(false);
8243 8559
8244 llSay(0, "No item name '" + item + "'"); 8560 llSay(0, "No item name '" + item + "'");
8245 8561
@@ -8768,16 +9084,16 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8768 { 9084 {
8769 m_host.AddScriptLPS(1); 9085 m_host.AddScriptLPS(1);
8770 9086
8771 lock (m_host.TaskInventory) 9087 m_host.TaskInventory.LockItemsForRead(true);
9088 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
8772 { 9089 {
8773 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 9090 if (inv.Value.Name == name)
8774 { 9091 {
8775 if (inv.Value.Name == name) 9092 m_host.TaskInventory.LockItemsForRead(false);
8776 { 9093 return inv.Value.Type;
8777 return inv.Value.Type;
8778 }
8779 } 9094 }
8780 } 9095 }
9096 m_host.TaskInventory.LockItemsForRead(false);
8781 9097
8782 return -1; 9098 return -1;
8783 } 9099 }
@@ -8787,16 +9103,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8787 m_host.AddScriptLPS(1); 9103 m_host.AddScriptLPS(1);
8788 9104
8789 if (quick_pay_buttons.Data.Length < 4) 9105 if (quick_pay_buttons.Data.Length < 4)
8790 { 9106 {
8791 LSLError("List must have at least 4 elements"); 9107 int x;
8792 return; 9108 for (x=quick_pay_buttons.Data.Length; x<= 4; x++)
9109 {
9110 quick_pay_buttons.Add(ScriptBaseClass.PAY_HIDE);
9111 }
8793 } 9112 }
8794 m_host.ParentGroup.RootPart.PayPrice[0]=price; 9113 int[] nPrice = new int[5];
8795 9114 nPrice[0]=price;
8796 m_host.ParentGroup.RootPart.PayPrice[1]=(LSL_Integer)quick_pay_buttons.Data[0]; 9115 nPrice[1] = (LSL_Integer)quick_pay_buttons.Data[0];
8797 m_host.ParentGroup.RootPart.PayPrice[2]=(LSL_Integer)quick_pay_buttons.Data[1]; 9116 nPrice[2] = (LSL_Integer)quick_pay_buttons.Data[1];
8798 m_host.ParentGroup.RootPart.PayPrice[3]=(LSL_Integer)quick_pay_buttons.Data[2]; 9117 nPrice[3] = (LSL_Integer)quick_pay_buttons.Data[2];
8799 m_host.ParentGroup.RootPart.PayPrice[4]=(LSL_Integer)quick_pay_buttons.Data[3]; 9118 nPrice[4] = (LSL_Integer)quick_pay_buttons.Data[3];
9119 m_host.ParentGroup.RootPart.PayPrice = nPrice;
8800 m_host.ParentGroup.HasGroupChanged = true; 9120 m_host.ParentGroup.HasGroupChanged = true;
8801 } 9121 }
8802 9122
@@ -8808,17 +9128,20 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8808 if (invItemID == UUID.Zero) 9128 if (invItemID == UUID.Zero)
8809 return new LSL_Vector(); 9129 return new LSL_Vector();
8810 9130
8811 lock (m_host.TaskInventory) 9131 m_host.TaskInventory.LockItemsForRead(true);
9132 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero)
8812 { 9133 {
8813 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero) 9134 m_host.TaskInventory.LockItemsForRead(false);
8814 return new LSL_Vector(); 9135 return new LSL_Vector();
9136 }
8815 9137
8816 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0) 9138 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
8817 { 9139 {
8818 ShoutError("No permissions to track the camera"); 9140 ShoutError("No permissions to track the camera");
8819 return new LSL_Vector(); 9141 m_host.TaskInventory.LockItemsForRead(false);
8820 } 9142 return new LSL_Vector();
8821 } 9143 }
9144 m_host.TaskInventory.LockItemsForRead(false);
8822 9145
8823 ScenePresence presence = World.GetScenePresence(m_host.OwnerID); 9146 ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
8824 if (presence != null) 9147 if (presence != null)
@@ -8836,17 +9159,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8836 if (invItemID == UUID.Zero) 9159 if (invItemID == UUID.Zero)
8837 return new LSL_Rotation(); 9160 return new LSL_Rotation();
8838 9161
8839 lock (m_host.TaskInventory) 9162 m_host.TaskInventory.LockItemsForRead(true);
9163 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero)
8840 { 9164 {
8841 if (m_host.TaskInventory[invItemID].PermsGranter == UUID.Zero) 9165 m_host.TaskInventory.LockItemsForRead(false);
8842 return new LSL_Rotation(); 9166 return new LSL_Rotation();
8843 9167 }
8844 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0) 9168 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_TRACK_CAMERA) == 0)
8845 { 9169 {
8846 ShoutError("No permissions to track the camera"); 9170 ShoutError("No permissions to track the camera");
8847 return new LSL_Rotation(); 9171 m_host.TaskInventory.LockItemsForRead(false);
8848 } 9172 return new LSL_Rotation();
8849 } 9173 }
9174 m_host.TaskInventory.LockItemsForRead(false);
8850 9175
8851 ScenePresence presence = World.GetScenePresence(m_host.OwnerID); 9176 ScenePresence presence = World.GetScenePresence(m_host.OwnerID);
8852 if (presence != null) 9177 if (presence != null)
@@ -8996,14 +9321,21 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
8996 if (objectID == UUID.Zero) return; 9321 if (objectID == UUID.Zero) return;
8997 9322
8998 UUID agentID; 9323 UUID agentID;
8999 lock (m_host.TaskInventory) 9324 m_host.TaskInventory.LockItemsForRead(true);
9000 { 9325 // we need the permission first, to know which avatar we want to set the camera for
9001 // we need the permission first, to know which avatar we want to set the camera for 9326 agentID = m_host.TaskInventory[invItemID].PermsGranter;
9002 agentID = m_host.TaskInventory[invItemID].PermsGranter;
9003 9327
9004 if (agentID == UUID.Zero) return; 9328 if (agentID == UUID.Zero)
9005 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0) return; 9329 {
9330 m_host.TaskInventory.LockItemsForRead(false);
9331 return;
9332 }
9333 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0)
9334 {
9335 m_host.TaskInventory.LockItemsForRead(false);
9336 return;
9006 } 9337 }
9338 m_host.TaskInventory.LockItemsForRead(false);
9007 9339
9008 ScenePresence presence = World.GetScenePresence(agentID); 9340 ScenePresence presence = World.GetScenePresence(agentID);
9009 9341
@@ -9053,12 +9385,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9053 9385
9054 // we need the permission first, to know which avatar we want to clear the camera for 9386 // we need the permission first, to know which avatar we want to clear the camera for
9055 UUID agentID; 9387 UUID agentID;
9056 lock (m_host.TaskInventory) 9388 m_host.TaskInventory.LockItemsForRead(true);
9389 agentID = m_host.TaskInventory[invItemID].PermsGranter;
9390 if (agentID == UUID.Zero)
9057 { 9391 {
9058 agentID = m_host.TaskInventory[invItemID].PermsGranter; 9392 m_host.TaskInventory.LockItemsForRead(false);
9059 if (agentID == UUID.Zero) return; 9393 return;
9060 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0) return;
9061 } 9394 }
9395 if ((m_host.TaskInventory[invItemID].PermsMask & ScriptBaseClass.PERMISSION_CONTROL_CAMERA) == 0)
9396 {
9397 m_host.TaskInventory.LockItemsForRead(false);
9398 return;
9399 }
9400 m_host.TaskInventory.LockItemsForRead(false);
9062 9401
9063 ScenePresence presence = World.GetScenePresence(agentID); 9402 ScenePresence presence = World.GetScenePresence(agentID);
9064 9403
@@ -9515,15 +9854,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9515 9854
9516 internal UUID ScriptByName(string name) 9855 internal UUID ScriptByName(string name)
9517 { 9856 {
9518 lock (m_host.TaskInventory) 9857 m_host.TaskInventory.LockItemsForRead(true);
9858
9859 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
9519 { 9860 {
9520 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 9861 if (item.Type == 10 && item.Name == name)
9521 { 9862 {
9522 if (item.Type == 10 && item.Name == name) 9863 m_host.TaskInventory.LockItemsForRead(false);
9523 return item.ItemID; 9864 return item.ItemID;
9524 } 9865 }
9525 } 9866 }
9526 9867
9868 m_host.TaskInventory.LockItemsForRead(false);
9869
9527 return UUID.Zero; 9870 return UUID.Zero;
9528 } 9871 }
9529 9872
@@ -9564,6 +9907,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9564 { 9907 {
9565 m_host.AddScriptLPS(1); 9908 m_host.AddScriptLPS(1);
9566 9909
9910 //Clone is thread safe
9567 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone(); 9911 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone();
9568 9912
9569 UUID assetID = UUID.Zero; 9913 UUID assetID = UUID.Zero;
@@ -9626,6 +9970,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9626 { 9970 {
9627 m_host.AddScriptLPS(1); 9971 m_host.AddScriptLPS(1);
9628 9972
9973 //Clone is thread safe
9629 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone(); 9974 TaskInventoryDictionary itemsDictionary = (TaskInventoryDictionary)m_host.TaskInventory.Clone();
9630 9975
9631 UUID assetID = UUID.Zero; 9976 UUID assetID = UUID.Zero;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 85ee29d..845834e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -718,18 +718,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
718 if (target != null) 718 if (target != null)
719 { 719 {
720 UUID animID=UUID.Zero; 720 UUID animID=UUID.Zero;
721 lock (m_host.TaskInventory) 721 m_host.TaskInventory.LockItemsForRead(true);
722 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
722 { 723 {
723 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 724 if (inv.Value.Name == animation)
724 { 725 {
725 if (inv.Value.Name == animation) 726 if (inv.Value.Type == (int)AssetType.Animation)
726 { 727 animID = inv.Value.AssetID;
727 if (inv.Value.Type == (int)AssetType.Animation) 728 continue;
728 animID = inv.Value.AssetID;
729 continue;
730 }
731 } 729 }
732 } 730 }
731 m_host.TaskInventory.LockItemsForRead(false);
733 if (animID == UUID.Zero) 732 if (animID == UUID.Zero)
734 target.Animator.AddAnimation(animation, m_host.UUID); 733 target.Animator.AddAnimation(animation, m_host.UUID);
735 else 734 else
@@ -751,18 +750,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
751 if (target != null) 750 if (target != null)
752 { 751 {
753 UUID animID=UUID.Zero; 752 UUID animID=UUID.Zero;
754 lock (m_host.TaskInventory) 753 m_host.TaskInventory.LockItemsForRead(true);
754 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory)
755 { 755 {
756 foreach (KeyValuePair<UUID, TaskInventoryItem> inv in m_host.TaskInventory) 756 if (inv.Value.Name == animation)
757 { 757 {
758 if (inv.Value.Name == animation) 758 if (inv.Value.Type == (int)AssetType.Animation)
759 { 759 animID = inv.Value.AssetID;
760 if (inv.Value.Type == (int)AssetType.Animation) 760 continue;
761 animID = inv.Value.AssetID;
762 continue;
763 }
764 } 761 }
765 } 762 }
763 m_host.TaskInventory.LockItemsForRead(false);
766 764
767 if (animID == UUID.Zero) 765 if (animID == UUID.Zero)
768 target.Animator.RemoveAnimation(animation); 766 target.Animator.RemoveAnimation(animation);
@@ -1531,6 +1529,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1531 1529
1532 if (!UUID.TryParse(name, out assetID)) 1530 if (!UUID.TryParse(name, out assetID))
1533 { 1531 {
1532 m_host.TaskInventory.LockItemsForRead(true);
1534 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 1533 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
1535 { 1534 {
1536 if (item.Type == 7 && item.Name == name) 1535 if (item.Type == 7 && item.Name == name)
@@ -1538,6 +1537,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1538 assetID = item.AssetID; 1537 assetID = item.AssetID;
1539 } 1538 }
1540 } 1539 }
1540 m_host.TaskInventory.LockItemsForRead(false);
1541 } 1541 }
1542 1542
1543 if (assetID == UUID.Zero) 1543 if (assetID == UUID.Zero)
@@ -1584,6 +1584,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1584 1584
1585 if (!UUID.TryParse(name, out assetID)) 1585 if (!UUID.TryParse(name, out assetID))
1586 { 1586 {
1587 m_host.TaskInventory.LockItemsForRead(true);
1587 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 1588 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
1588 { 1589 {
1589 if (item.Type == 7 && item.Name == name) 1590 if (item.Type == 7 && item.Name == name)
@@ -1591,6 +1592,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1591 assetID = item.AssetID; 1592 assetID = item.AssetID;
1592 } 1593 }
1593 } 1594 }
1595 m_host.TaskInventory.LockItemsForRead(false);
1594 } 1596 }
1595 1597
1596 if (assetID == UUID.Zero) 1598 if (assetID == UUID.Zero)
@@ -1641,6 +1643,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1641 1643
1642 if (!UUID.TryParse(name, out assetID)) 1644 if (!UUID.TryParse(name, out assetID))
1643 { 1645 {
1646 m_host.TaskInventory.LockItemsForRead(true);
1644 foreach (TaskInventoryItem item in m_host.TaskInventory.Values) 1647 foreach (TaskInventoryItem item in m_host.TaskInventory.Values)
1645 { 1648 {
1646 if (item.Type == 7 && item.Name == name) 1649 if (item.Type == 7 && item.Name == name)
@@ -1648,6 +1651,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1648 assetID = item.AssetID; 1651 assetID = item.AssetID;
1649 } 1652 }
1650 } 1653 }
1654 m_host.TaskInventory.LockItemsForRead(false);
1651 } 1655 }
1652 1656
1653 if (assetID == UUID.Zero) 1657 if (assetID == UUID.Zero)
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
index eeb59d9..2fd33fe 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
@@ -109,25 +109,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
109 if (Timers.Count == 0) 109 if (Timers.Count == 0)
110 return; 110 return;
111 111
112 Dictionary<string, TimerClass>.ValueCollection tvals;
112 lock (TimerListLock) 113 lock (TimerListLock)
113 { 114 {
114 // Go through all timers 115 // Go through all timers
115 Dictionary<string, TimerClass>.ValueCollection tvals = Timers.Values; 116 tvals = Timers.Values;
116 foreach (TimerClass ts in tvals) 117 }
118
119 foreach (TimerClass ts in tvals)
120 {
121 // Time has passed?
122 if (ts.next < DateTime.Now.Ticks)
117 { 123 {
118 // Time has passed? 124 //m_log.Debug("Time has passed: Now: " + DateTime.Now.Ticks + ", Passed: " + ts.next);
119 if (ts.next < DateTime.Now.Ticks) 125 // Add it to queue
120 { 126 m_CmdManager.m_ScriptEngine.PostScriptEvent(ts.itemID,
121 //m_log.Debug("Time has passed: Now: " + DateTime.Now.Ticks + ", Passed: " + ts.next); 127 new EventParams("timer", new Object[0],
122 // Add it to queue 128 new DetectParams[0]));
123 m_CmdManager.m_ScriptEngine.PostScriptEvent(ts.itemID, 129 // set next interval
124 new EventParams("timer", new Object[0], 130
125 new DetectParams[0])); 131 //ts.next = DateTime.Now.ToUniversalTime().AddSeconds(ts.interval);
126 // set next interval 132 ts.next = DateTime.Now.Ticks + ts.interval;
127
128 //ts.next = DateTime.Now.ToUniversalTime().AddSeconds(ts.interval);
129 ts.next = DateTime.Now.Ticks + ts.interval;
130 }
131 } 133 }
132 } 134 }
133 } 135 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs
new file mode 100644
index 0000000..ef990a1
--- /dev/null
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ICM_Api.cs
@@ -0,0 +1,21 @@
1using System.Collections;
2using OpenSim.Region.ScriptEngine.Interfaces;
3
4using key = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
5using rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion;
6using vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3;
7using LSL_List = OpenSim.Region.ScriptEngine.Shared.LSL_Types.list;
8using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
9using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger;
10using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat;
11
12namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
13{
14 public interface ICM_Api
15 {
16 // Windlight Functions
17 LSL_List cmGetWindlightScene(LSL_List rules);
18 int cmSetWindlightScene(LSL_List rules);
19 int cmSetWindlightSceneTargeted(LSL_List rules, key target);
20 }
21}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 60b8050..f5921e1 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -80,7 +80,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
80 // Avatar Info Commands 80 // Avatar Info Commands
81 string osGetAgentIP(string agent); 81 string osGetAgentIP(string agent);
82 LSL_List osGetAgents(); 82 LSL_List osGetAgents();
83 83
84 // Teleport commands 84 // Teleport commands
85 void osTeleportAgent(string agent, string regionName, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); 85 void osTeleportAgent(string agent, string regionName, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat);
86 void osTeleportAgent(string agent, int regionX, int regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat); 86 void osTeleportAgent(string agent, int regionX, int regionY, LSL_Types.Vector3 position, LSL_Types.Vector3 lookat);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Constants.cs
new file mode 100644
index 0000000..522c020
--- /dev/null
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Constants.cs
@@ -0,0 +1,77 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3;
30using rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion;
31using LSLInteger = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger;
32
33namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
34{
35 public partial class ScriptBaseClass
36 {
37 // Constants for cmWindlight*
38 public const int WL_WATER_COLOR = 0;
39 public const int WL_WATER_FOG_DENSITY_EXPONENT = 1;
40 public const int WL_UNDERWATER_FOG_MODIFIER = 2;
41 public const int WL_REFLECTION_WAVELET_SCALE = 3;
42 public const int WL_FRESNEL_SCALE = 4;
43 public const int WL_FRESNEL_OFFSET = 5;
44 public const int WL_REFRACT_SCALE_ABOVE = 6;
45 public const int WL_REFRACT_SCALE_BELOW = 7;
46 public const int WL_BLUR_MULTIPLIER = 8;
47 public const int WL_BIG_WAVE_DIRECTION = 9;
48 public const int WL_LITTLE_WAVE_DIRECTION = 10;
49 public const int WL_NORMAL_MAP_TEXTURE = 11;
50 public const int WL_HORIZON = 12;
51 public const int WL_HAZE_HORIZON = 13;
52 public const int WL_BLUE_DENSITY = 14;
53 public const int WL_HAZE_DENSITY = 15;
54 public const int WL_DENSITY_MULTIPLIER = 16;
55 public const int WL_DISTANCE_MULTIPLIER = 17;
56 public const int WL_MAX_ALTITUDE = 18;
57 public const int WL_SUN_MOON_COLOR = 19;
58 public const int WL_AMBIENT = 20;
59 public const int WL_EAST_ANGLE = 21;
60 public const int WL_SUN_GLOW_FOCUS = 22;
61 public const int WL_SUN_GLOW_SIZE = 23;
62 public const int WL_SCENE_GAMMA = 24;
63 public const int WL_STAR_BRIGHTNESS = 25;
64 public const int WL_CLOUD_COLOR = 26;
65 public const int WL_CLOUD_XY_DENSITY = 27;
66 public const int WL_CLOUD_COVERAGE = 28;
67 public const int WL_CLOUD_SCALE = 29;
68 public const int WL_CLOUD_DETAIL_XY_DENSITY = 30;
69 public const int WL_CLOUD_SCROLL_X = 31;
70 public const int WL_CLOUD_SCROLL_Y = 32;
71 public const int WL_CLOUD_SCROLL_Y_LOCK = 33;
72 public const int WL_CLOUD_SCROLL_X_LOCK = 34;
73 public const int WL_DRAW_CLASSIC_CLOUDS = 35;
74 public const int WL_SUN_MOON_POSITION = 36;
75
76 }
77}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs
new file mode 100644
index 0000000..5bc3a88
--- /dev/null
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/CM_Stub.cs
@@ -0,0 +1,76 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Runtime.Remoting.Lifetime;
30using System.Threading;
31using System.Reflection;
32using System.Collections;
33using System.Collections.Generic;
34using OpenSim.Framework;
35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.ScriptEngine.Interfaces;
37using OpenSim.Region.ScriptEngine.Shared.Api.Interfaces;
38using integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger;
39using vector = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Vector3;
40using rotation = OpenSim.Region.ScriptEngine.Shared.LSL_Types.Quaternion;
41using key = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
42using LSL_List = OpenSim.Region.ScriptEngine.Shared.LSL_Types.list;
43using LSL_String = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLString;
44using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat;
45using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger;
46
47namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
48{
49 public partial class ScriptBaseClass : MarshalByRefObject
50 {
51 public ICM_Api m_CM_Functions;
52
53 public void ApiTypeCM(IScriptApi api)
54 {
55 if (!(api is ICM_Api))
56 return;
57
58 m_CM_Functions = (ICM_Api)api;
59 }
60
61 public LSL_List cmGetWindlightScene(LSL_List rules)
62 {
63 return m_CM_Functions.cmGetWindlightScene(rules);
64 }
65
66 public int cmSetWindlightScene(LSL_List rules)
67 {
68 return m_CM_Functions.cmSetWindlightScene(rules);
69 }
70
71 public int cmSetWindlightSceneTargeted(LSL_List rules, key target)
72 {
73 return m_CM_Functions.cmSetWindlightSceneTargeted(rules, target);
74 }
75 }
76}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
index 9615315..943d7a2 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
@@ -27,6 +27,7 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Diagnostics; //for [DebuggerNonUserCode]
30using System.Reflection; 31using System.Reflection;
31using System.Runtime.Remoting.Lifetime; 32using System.Runtime.Remoting.Lifetime;
32using OpenSim.Region.ScriptEngine.Shared; 33using OpenSim.Region.ScriptEngine.Shared;
@@ -132,6 +133,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
132 return (eventFlags); 133 return (eventFlags);
133 } 134 }
134 135
136 [DebuggerNonUserCode]
135 public void ExecuteEvent(string state, string FunctionName, object[] args) 137 public void ExecuteEvent(string state, string FunctionName, object[] args)
136 { 138 {
137 // IMPORTANT: Types and MemberInfo-derived objects require a LOT of memory. 139 // IMPORTANT: Types and MemberInfo-derived objects require a LOT of memory.
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.mdp b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.mdp
index 98bbc68..23138ef 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.mdp
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.mdp
@@ -17,6 +17,8 @@
17 <excludeFiles /> 17 <excludeFiles />
18 </DeploymentInformation> 18 </DeploymentInformation>
19 <Contents> 19 <Contents>
20 <File name="./CM_Constants.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
21 <File name="./CM_Stub.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
20 <File name="./Executor.cs" subtype="Code" buildaction="Compile" dependson="" data="" /> 22 <File name="./Executor.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
21 <File name="./LSL_Constants.cs" subtype="Code" buildaction="Compile" dependson="" data="" /> 23 <File name="./LSL_Constants.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
22 <File name="./LSL_Stub.cs" subtype="Code" buildaction="Compile" dependson="" data="" /> 24 <File name="./LSL_Stub.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
index edbbc2a..b138da3 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
@@ -33,6 +33,7 @@ using System.Threading;
33using System.Reflection; 33using System.Reflection;
34using System.Collections; 34using System.Collections;
35using System.Collections.Generic; 35using System.Collections.Generic;
36using System.Diagnostics; //for [DebuggerNonUserCode]
36using OpenSim.Region.ScriptEngine.Interfaces; 37using OpenSim.Region.ScriptEngine.Interfaces;
37using OpenSim.Region.ScriptEngine.Shared; 38using OpenSim.Region.ScriptEngine.Shared;
38using OpenSim.Region.ScriptEngine.Shared.Api.Runtime; 39using OpenSim.Region.ScriptEngine.Shared.Api.Runtime;
@@ -90,6 +91,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
90 return (int)m_Executor.GetStateEventFlags(state); 91 return (int)m_Executor.GetStateEventFlags(state);
91 } 92 }
92 93
94 [DebuggerNonUserCode]
93 public void ExecuteEvent(string state, string FunctionName, object[] args) 95 public void ExecuteEvent(string state, string FunctionName, object[] args)
94 { 96 {
95 m_Executor.ExecuteEvent(state, FunctionName, args); 97 m_Executor.ExecuteEvent(state, FunctionName, args);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index d30d2dc..6ecafd4 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -27,6 +27,7 @@
27 27
28using System; 28using System;
29using System.IO; 29using System.IO;
30using System.Diagnostics; //for [DebuggerNonUserCode]
30using System.Runtime.Remoting; 31using System.Runtime.Remoting;
31using System.Runtime.Remoting.Lifetime; 32using System.Runtime.Remoting.Lifetime;
32using System.Threading; 33using System.Threading;
@@ -237,13 +238,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
237 238
238 if (part != null) 239 if (part != null)
239 { 240 {
240 lock (part.TaskInventory) 241 part.TaskInventory.LockItemsForRead(true);
242 if (part.TaskInventory.ContainsKey(m_ItemID))
241 { 243 {
242 if (part.TaskInventory.ContainsKey(m_ItemID)) 244 m_thisScriptTask = part.TaskInventory[m_ItemID];
243 {
244 m_thisScriptTask = part.TaskInventory[m_ItemID];
245 }
246 } 245 }
246 part.TaskInventory.LockItemsForRead(false);
247 } 247 }
248 248
249 ApiManager am = new ApiManager(); 249 ApiManager am = new ApiManager();
@@ -428,14 +428,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
428 { 428 {
429 int permsMask; 429 int permsMask;
430 UUID permsGranter; 430 UUID permsGranter;
431 lock (part.TaskInventory) 431 part.TaskInventory.LockItemsForRead(true);
432 if (!part.TaskInventory.ContainsKey(m_ItemID))
432 { 433 {
433 if (!part.TaskInventory.ContainsKey(m_ItemID)) 434 part.TaskInventory.LockItemsForRead(false);
434 return; 435 return;
435
436 permsGranter = part.TaskInventory[m_ItemID].PermsGranter;
437 permsMask = part.TaskInventory[m_ItemID].PermsMask;
438 } 436 }
437 permsGranter = part.TaskInventory[m_ItemID].PermsGranter;
438 permsMask = part.TaskInventory[m_ItemID].PermsMask;
439 part.TaskInventory.LockItemsForRead(false);
439 440
440 if ((permsMask & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) != 0) 441 if ((permsMask & ScriptBaseClass.PERMISSION_TAKE_CONTROLS) != 0)
441 { 442 {
@@ -544,6 +545,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
544 return true; 545 return true;
545 } 546 }
546 547
548 [DebuggerNonUserCode] //Prevents the debugger from farting in this function
547 public void SetState(string state) 549 public void SetState(string state)
548 { 550 {
549 if (state == State) 551 if (state == State)
@@ -555,7 +557,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
555 new DetectParams[0])); 557 new DetectParams[0]));
556 PostEvent(new EventParams("state_entry", new Object[0], 558 PostEvent(new EventParams("state_entry", new Object[0],
557 new DetectParams[0])); 559 new DetectParams[0]));
558 560
559 throw new EventAbortException(); 561 throw new EventAbortException();
560 } 562 }
561 563
@@ -638,154 +640,158 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
638 /// <returns></returns> 640 /// <returns></returns>
639 public object EventProcessor() 641 public object EventProcessor()
640 { 642 {
643
644 EventParams data = null;
645
646 lock (m_EventQueue)
647 {
641 lock (m_Script) 648 lock (m_Script)
642 { 649 {
643 EventParams data = null; 650 data = (EventParams) m_EventQueue.Dequeue();
644 651 if (data == null) // Shouldn't happen
645 lock (m_EventQueue)
646 { 652 {
647 data = (EventParams) m_EventQueue.Dequeue(); 653 if ((m_EventQueue.Count > 0) && m_RunEvents && (!m_ShuttingDown))
648 if (data == null) // Shouldn't happen
649 { 654 {
650 if ((m_EventQueue.Count > 0) && m_RunEvents && (!m_ShuttingDown)) 655 m_CurrentResult = m_Engine.QueueEventHandler(this);
651 {
652 m_CurrentResult = m_Engine.QueueEventHandler(this);
653 }
654 else
655 {
656 m_CurrentResult = null;
657 }
658 return 0;
659 } 656 }
660 657 else
661 if (data.EventName == "timer")
662 m_TimerQueued = false;
663 if (data.EventName == "control")
664 { 658 {
665 if (m_ControlEventsInQueue > 0) 659 m_CurrentResult = null;
666 m_ControlEventsInQueue--;
667 } 660 }
668 if (data.EventName == "collision") 661 return 0;
669 m_CollisionInQueue = false;
670 } 662 }
671
672 //m_log.DebugFormat("[XENGINE]: Processing event {0} for {1}", data.EventName, this);
673 663
674 m_DetectParams = data.DetectParams; 664 if (data.EventName == "timer")
675 665 m_TimerQueued = false;
676 if (data.EventName == "state") // Hardcoded state change 666 if (data.EventName == "control")
677 { 667 {
678 // m_log.DebugFormat("[Script] Script {0}.{1} state set to {2}", 668 if (m_ControlEventsInQueue > 0)
679 // m_PrimName, m_ScriptName, data.Params[0].ToString()); 669 m_ControlEventsInQueue--;
680 m_State=data.Params[0].ToString(); 670 }
681 AsyncCommandManager.RemoveScript(m_Engine, 671 if (data.EventName == "collision")
682 m_LocalID, m_ItemID); 672 m_CollisionInQueue = false;
673 }
674 }
675 lock(m_Script)
676 {
677
678 //m_log.DebugFormat("[XENGINE]: Processing event {0} for {1}", data.EventName, this);
683 679
684 SceneObjectPart part = m_Engine.World.GetSceneObjectPart( 680 m_DetectParams = data.DetectParams;
685 m_LocalID); 681
686 if (part != null) 682 if (data.EventName == "state") // Hardcoded state change
687 { 683 {
688 part.SetScriptEvents(m_ItemID, 684// m_log.DebugFormat("[Script] Script {0}.{1} state set to {2}",
689 (int)m_Script.GetStateEventFlags(State)); 685// m_PrimName, m_ScriptName, data.Params[0].ToString());
690 } 686 m_State=data.Params[0].ToString();
687 AsyncCommandManager.RemoveScript(m_Engine,
688 m_LocalID, m_ItemID);
689
690 SceneObjectPart part = m_Engine.World.GetSceneObjectPart(
691 m_LocalID);
692 if (part != null)
693 {
694 part.SetScriptEvents(m_ItemID,
695 (int)m_Script.GetStateEventFlags(State));
691 } 696 }
692 else 697 }
698 else
699 {
700 if (m_Engine.World.PipeEventsForScript(m_LocalID) ||
701 data.EventName == "control") // Don't freeze avies!
693 { 702 {
694 if (m_Engine.World.PipeEventsForScript(m_LocalID) || 703 SceneObjectPart part = m_Engine.World.GetSceneObjectPart(
695 data.EventName == "control") // Don't freeze avies! 704 m_LocalID);
696 { 705 // m_log.DebugFormat("[Script] Delivered event {2} in state {3} to {0}.{1}",
697 SceneObjectPart part = m_Engine.World.GetSceneObjectPart( 706 // m_PrimName, m_ScriptName, data.EventName, m_State);
698 m_LocalID);
699 // m_log.DebugFormat("[Script] Delivered event {2} in state {3} to {0}.{1}",
700 // m_PrimName, m_ScriptName, data.EventName, m_State);
701 707
702 try 708 try
703 { 709 {
704 m_CurrentEvent = data.EventName; 710 m_CurrentEvent = data.EventName;
705 m_EventStart = DateTime.Now; 711 m_EventStart = DateTime.Now;
706 m_InEvent = true; 712 m_InEvent = true;
707 713
708 m_Script.ExecuteEvent(State, data.EventName, data.Params); 714 m_Script.ExecuteEvent(State, data.EventName, data.Params);
709 715
710 m_InEvent = false; 716 m_InEvent = false;
711 m_CurrentEvent = String.Empty; 717 m_CurrentEvent = String.Empty;
712 718
713 if (m_SaveState) 719 if (m_SaveState)
714 { 720 {
715 // This will be the very first event we deliver 721 // This will be the very first event we deliver
716 // (state_entry) in default state 722 // (state_entry) in default state
717 // 723 //
718 724
719 SaveState(m_Assembly); 725 SaveState(m_Assembly);
720 726
721 m_SaveState = false; 727 m_SaveState = false;
722 }
723 } 728 }
724 catch (Exception e) 729 }
725 { 730 catch (Exception e)
726 // m_log.DebugFormat("[SCRIPT] Exception: {0}", e.Message); 731 {
727 m_InEvent = false; 732 // m_log.DebugFormat("[SCRIPT] Exception: {0}", e.Message);
728 m_CurrentEvent = String.Empty; 733 m_InEvent = false;
734 m_CurrentEvent = String.Empty;
729 735
730 if ((!(e is TargetInvocationException) || (!(e.InnerException is SelfDeleteException) && !(e.InnerException is ScriptDeleteException))) && !(e is ThreadAbortException)) 736 if ((!(e is TargetInvocationException) || (!(e.InnerException is SelfDeleteException) && !(e.InnerException is ScriptDeleteException))) && !(e is ThreadAbortException))
731 { 737 {
732 try 738 try
733 {
734 // DISPLAY ERROR INWORLD
735 string text = FormatException(e);
736
737 if (text.Length > 1000)
738 text = text.Substring(0, 1000);
739 m_Engine.World.SimChat(Utils.StringToBytes(text),
740 ChatTypeEnum.DebugChannel, 2147483647,
741 part.AbsolutePosition,
742 part.Name, part.UUID, false);
743 }
744 catch (Exception)
745 {
746 }
747 // catch (Exception e2) // LEGIT: User Scripting
748 // {
749 // m_log.Error("[SCRIPT]: "+
750 // "Error displaying error in-world: " +
751 // e2.ToString());
752 // m_log.Error("[SCRIPT]: " +
753 // "Errormessage: Error compiling script:\r\n" +
754 // e.ToString());
755 // }
756 }
757 else if ((e is TargetInvocationException) && (e.InnerException is SelfDeleteException))
758 { 739 {
759 m_InSelfDelete = true; 740 // DISPLAY ERROR INWORLD
760 if (part != null && part.ParentGroup != null) 741 string text = FormatException(e);
761 m_Engine.World.DeleteSceneObject(part.ParentGroup, false); 742
743 if (text.Length > 1000)
744 text = text.Substring(0, 1000);
745 m_Engine.World.SimChat(Utils.StringToBytes(text),
746 ChatTypeEnum.DebugChannel, 2147483647,
747 part.AbsolutePosition,
748 part.Name, part.UUID, false);
762 } 749 }
763 else if ((e is TargetInvocationException) && (e.InnerException is ScriptDeleteException)) 750 catch (Exception)
764 { 751 {
765 m_InSelfDelete = true;
766 if (part != null && part.ParentGroup != null)
767 part.Inventory.RemoveInventoryItem(m_ItemID);
768 } 752 }
753 // catch (Exception e2) // LEGIT: User Scripting
754 // {
755 // m_log.Error("[SCRIPT]: "+
756 // "Error displaying error in-world: " +
757 // e2.ToString());
758 // m_log.Error("[SCRIPT]: " +
759 // "Errormessage: Error compiling script:\r\n" +
760 // e.ToString());
761 // }
762 }
763 else if ((e is TargetInvocationException) && (e.InnerException is SelfDeleteException))
764 {
765 m_InSelfDelete = true;
766 if (part != null && part.ParentGroup != null)
767 m_Engine.World.DeleteSceneObject(part.ParentGroup, false);
768 }
769 else if ((e is TargetInvocationException) && (e.InnerException is ScriptDeleteException))
770 {
771 m_InSelfDelete = true;
772 if (part != null && part.ParentGroup != null)
773 part.Inventory.RemoveInventoryItem(m_ItemID);
769 } 774 }
770 } 775 }
771 } 776 }
777 }
772 778
773 lock (m_EventQueue) 779 lock (m_EventQueue)
780 {
781 if ((m_EventQueue.Count > 0) && m_RunEvents && (!m_ShuttingDown))
774 { 782 {
775 if ((m_EventQueue.Count > 0) && m_RunEvents && (!m_ShuttingDown)) 783 m_CurrentResult = m_Engine.QueueEventHandler(this);
776 { 784 }
777 m_CurrentResult = m_Engine.QueueEventHandler(this); 785 else
778 } 786 {
779 else 787 m_CurrentResult = null;
780 {
781 m_CurrentResult = null;
782 }
783 } 788 }
789 }
784 790
785 m_DetectParams = null; 791 m_DetectParams = null;
786 792
787 return 0; 793 return 0;
788 } 794 }
789 } 795 }
790 796
791 public int EventTime() 797 public int EventTime()
@@ -824,6 +830,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
824 new Object[0], new DetectParams[0])); 830 new Object[0], new DetectParams[0]));
825 } 831 }
826 832
833 [DebuggerNonUserCode] //Stops the VS debugger from farting in this function
827 public void ApiResetScript() 834 public void ApiResetScript()
828 { 835 {
829 // bool running = Running; 836 // bool running = Running;
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 98e77c0..35d57d8 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -30,6 +30,7 @@ using System.IO;
30using System.Threading; 30using System.Threading;
31using System.Collections; 31using System.Collections;
32using System.Collections.Generic; 32using System.Collections.Generic;
33using System.Diagnostics; //for [DebuggerNonUserCode]
33using System.Security; 34using System.Security;
34using System.Security.Policy; 35using System.Security.Policy;
35using System.Reflection; 36using System.Reflection;
@@ -102,6 +103,8 @@ namespace OpenSim.Region.ScriptEngine.XEngine
102 private Dictionary<UUID, IScriptInstance> m_Scripts = 103 private Dictionary<UUID, IScriptInstance> m_Scripts =
103 new Dictionary<UUID, IScriptInstance>(); 104 new Dictionary<UUID, IScriptInstance>();
104 105
106 private OpenMetaverse.ReaderWriterLockSlim m_scriptsLock = new OpenMetaverse.ReaderWriterLockSlim();
107
105 // Maps the asset ID to the assembly 108 // Maps the asset ID to the assembly
106 109
107 private Dictionary<UUID, string> m_Assemblies = 110 private Dictionary<UUID, string> m_Assemblies =
@@ -123,6 +126,71 @@ namespace OpenSim.Region.ScriptEngine.XEngine
123 private ScriptCompileQueue m_CompileQueue = new ScriptCompileQueue(); 126 private ScriptCompileQueue m_CompileQueue = new ScriptCompileQueue();
124 IWorkItemResult m_CurrentCompile = null; 127 IWorkItemResult m_CurrentCompile = null;
125 128
129 private void lockScriptsForRead(bool locked)
130 {
131 if (locked)
132 {
133 if (m_scriptsLock.RecursiveReadCount > 0)
134 {
135 m_log.Error("[XEngine.m_Scripts] Recursive read lock requested. This should not happen and means something needs to be fixed. For now though, it's safe to continue.");
136 m_scriptsLock.ExitReadLock();
137 }
138 if (m_scriptsLock.RecursiveWriteCount > 0)
139 {
140 m_log.Error("[XEngine.m_Scripts] Recursive write lock requested. This should not happen and means something needs to be fixed.");
141 m_scriptsLock.ExitWriteLock();
142 }
143
144 while (!m_scriptsLock.TryEnterReadLock(60000))
145 {
146 m_log.Error("[XEngine.m_Scripts] Thread lock detected while trying to aquire READ lock of m_scripts in XEngine. I'm going to try to solve the thread lock automatically to preserve region stability, but this needs to be fixed.");
147 if (m_scriptsLock.IsWriteLockHeld)
148 {
149 m_scriptsLock = new OpenMetaverse.ReaderWriterLockSlim();
150 }
151 }
152 }
153 else
154 {
155 if (m_scriptsLock.RecursiveReadCount > 0)
156 {
157 m_scriptsLock.ExitReadLock();
158 }
159 }
160 }
161 private void lockScriptsForWrite(bool locked)
162 {
163 if (locked)
164 {
165 if (m_scriptsLock.RecursiveReadCount > 0)
166 {
167 m_log.Error("[XEngine.m_Scripts] Recursive read lock requested. This should not happen and means something needs to be fixed. For now though, it's safe to continue.");
168 m_scriptsLock.ExitReadLock();
169 }
170 if (m_scriptsLock.RecursiveWriteCount > 0)
171 {
172 m_log.Error("[XEngine.m_Scripts] Recursive write lock requested. This should not happen and means something needs to be fixed.");
173 m_scriptsLock.ExitWriteLock();
174 }
175
176 while (!m_scriptsLock.TryEnterWriteLock(60000))
177 {
178 m_log.Error("[XEngine.m_Scripts] Thread lock detected while trying to aquire WRITE lock of m_scripts in XEngine. I'm going to try to solve the thread lock automatically to preserve region stability, but this needs to be fixed.");
179 if (m_scriptsLock.IsWriteLockHeld)
180 {
181 m_scriptsLock = new OpenMetaverse.ReaderWriterLockSlim();
182 }
183 }
184 }
185 else
186 {
187 if (m_scriptsLock.RecursiveWriteCount > 0)
188 {
189 m_scriptsLock.ExitWriteLock();
190 }
191 }
192 }
193
126 public string ScriptEngineName 194 public string ScriptEngineName
127 { 195 {
128 get { return "XEngine"; } 196 get { return "XEngine"; }
@@ -262,43 +330,45 @@ namespace OpenSim.Region.ScriptEngine.XEngine
262 330
263 public void RemoveRegion(Scene scene) 331 public void RemoveRegion(Scene scene)
264 { 332 {
265 lock (m_Scripts) 333 lockScriptsForRead(true);
334 foreach (IScriptInstance instance in m_Scripts.Values)
266 { 335 {
267 foreach (IScriptInstance instance in m_Scripts.Values) 336 // Force a final state save
337 //
338 if (m_Assemblies.ContainsKey(instance.AssetID))
268 { 339 {
269 // Force a final state save 340 string assembly = m_Assemblies[instance.AssetID];
270 // 341 instance.SaveState(assembly);
271 if (m_Assemblies.ContainsKey(instance.AssetID)) 342 }
272 {
273 string assembly = m_Assemblies[instance.AssetID];
274 instance.SaveState(assembly);
275 }
276 343
277 // Clear the event queue and abort the instance thread 344 // Clear the event queue and abort the instance thread
278 // 345 //
279 instance.ClearQueue(); 346 instance.ClearQueue();
280 instance.Stop(0); 347 instance.Stop(0);
281 348
282 // Release events, timer, etc 349 // Release events, timer, etc
283 // 350 //
284 instance.DestroyScriptInstance(); 351 instance.DestroyScriptInstance();
285 352
286 // Unload scripts and app domains 353 // Unload scripts and app domains
287 // Must be done explicitly because they have infinite 354 // Must be done explicitly because they have infinite
288 // lifetime 355 // lifetime
289 // 356 //
290 m_DomainScripts[instance.AppDomain].Remove(instance.ItemID); 357 m_DomainScripts[instance.AppDomain].Remove(instance.ItemID);
291 if (m_DomainScripts[instance.AppDomain].Count == 0) 358 if (m_DomainScripts[instance.AppDomain].Count == 0)
292 { 359 {
293 m_DomainScripts.Remove(instance.AppDomain); 360 m_DomainScripts.Remove(instance.AppDomain);
294 UnloadAppDomain(instance.AppDomain); 361 UnloadAppDomain(instance.AppDomain);
295 }
296 } 362 }
297 m_Scripts.Clear();
298 m_PrimObjects.Clear();
299 m_Assemblies.Clear();
300 m_DomainScripts.Clear();
301 } 363 }
364 lockScriptsForRead(false);
365 lockScriptsForWrite(true);
366 m_Scripts.Clear();
367 lockScriptsForWrite(false);
368 m_PrimObjects.Clear();
369 m_Assemblies.Clear();
370 m_DomainScripts.Clear();
371
302 lock (m_ScriptEngines) 372 lock (m_ScriptEngines)
303 { 373 {
304 m_ScriptEngines.Remove(this); 374 m_ScriptEngines.Remove(this);
@@ -357,22 +427,20 @@ namespace OpenSim.Region.ScriptEngine.XEngine
357 427
358 List<IScriptInstance> instances = new List<IScriptInstance>(); 428 List<IScriptInstance> instances = new List<IScriptInstance>();
359 429
360 lock (m_Scripts) 430 lockScriptsForRead(true);
361 { 431 foreach (IScriptInstance instance in m_Scripts.Values)
362 foreach (IScriptInstance instance in m_Scripts.Values)
363 instances.Add(instance); 432 instances.Add(instance);
364 } 433 lockScriptsForRead(false);
365 434
366 foreach (IScriptInstance i in instances) 435 foreach (IScriptInstance i in instances)
367 { 436 {
368 string assembly = String.Empty; 437 string assembly = String.Empty;
369 438
370 lock (m_Scripts) 439
371 {
372 if (!m_Assemblies.ContainsKey(i.AssetID)) 440 if (!m_Assemblies.ContainsKey(i.AssetID))
373 continue; 441 continue;
374 assembly = m_Assemblies[i.AssetID]; 442 assembly = m_Assemblies[i.AssetID];
375 } 443
376 444
377 i.SaveState(assembly); 445 i.SaveState(assembly);
378 } 446 }
@@ -684,170 +752,181 @@ namespace OpenSim.Region.ScriptEngine.XEngine
684 } 752 }
685 } 753 }
686 754
687 lock (m_Scripts) 755
756
757 ScriptInstance instance = null;
758 // Create the object record
759 lockScriptsForRead(true);
760 if ((!m_Scripts.ContainsKey(itemID)) ||
761 (m_Scripts[itemID].AssetID != assetID))
688 { 762 {
689 ScriptInstance instance = null; 763 lockScriptsForRead(false);
690 // Create the object record
691 764
692 if ((!m_Scripts.ContainsKey(itemID)) || 765 UUID appDomain = assetID;
693 (m_Scripts[itemID].AssetID != assetID))
694 {
695 UUID appDomain = assetID;
696 766
697 if (part.ParentGroup.IsAttachment) 767 if (part.ParentGroup.IsAttachment)
698 appDomain = part.ParentGroup.RootPart.UUID; 768 appDomain = part.ParentGroup.RootPart.UUID;
699 769
700 if (!m_AppDomains.ContainsKey(appDomain)) 770 if (!m_AppDomains.ContainsKey(appDomain))
771 {
772 try
701 { 773 {
702 try 774 AppDomainSetup appSetup = new AppDomainSetup();
703 { 775 // appSetup.ApplicationBase = Path.Combine(
704 AppDomainSetup appSetup = new AppDomainSetup(); 776 // "ScriptEngines",
705// appSetup.ApplicationBase = Path.Combine( 777 // m_Scene.RegionInfo.RegionID.ToString());
706// "ScriptEngines", 778
707// m_Scene.RegionInfo.RegionID.ToString()); 779 Evidence baseEvidence = AppDomain.CurrentDomain.Evidence;
708 780 Evidence evidence = new Evidence(baseEvidence);
709 Evidence baseEvidence = AppDomain.CurrentDomain.Evidence; 781
710 Evidence evidence = new Evidence(baseEvidence); 782 AppDomain sandbox;
711 783 if (m_AppDomainLoading)
712 AppDomain sandbox; 784 sandbox = AppDomain.CreateDomain(
713 if (m_AppDomainLoading) 785 m_Scene.RegionInfo.RegionID.ToString(),
714 sandbox = AppDomain.CreateDomain( 786 evidence, appSetup);
715 m_Scene.RegionInfo.RegionID.ToString(), 787 else
716 evidence, appSetup); 788 sandbox = AppDomain.CurrentDomain;
717 else 789
718 sandbox = AppDomain.CurrentDomain; 790 //PolicyLevel sandboxPolicy = PolicyLevel.CreateAppDomainLevel();
719 791 //AllMembershipCondition sandboxMembershipCondition = new AllMembershipCondition();
720 //PolicyLevel sandboxPolicy = PolicyLevel.CreateAppDomainLevel(); 792 //PermissionSet sandboxPermissionSet = sandboxPolicy.GetNamedPermissionSet("Internet");
721 //AllMembershipCondition sandboxMembershipCondition = new AllMembershipCondition(); 793 //PolicyStatement sandboxPolicyStatement = new PolicyStatement(sandboxPermissionSet);
722 //PermissionSet sandboxPermissionSet = sandboxPolicy.GetNamedPermissionSet("Internet"); 794 //CodeGroup sandboxCodeGroup = new UnionCodeGroup(sandboxMembershipCondition, sandboxPolicyStatement);
723 //PolicyStatement sandboxPolicyStatement = new PolicyStatement(sandboxPermissionSet); 795 //sandboxPolicy.RootCodeGroup = sandboxCodeGroup;
724 //CodeGroup sandboxCodeGroup = new UnionCodeGroup(sandboxMembershipCondition, sandboxPolicyStatement); 796 //sandbox.SetAppDomainPolicy(sandboxPolicy);
725 //sandboxPolicy.RootCodeGroup = sandboxCodeGroup; 797
726 //sandbox.SetAppDomainPolicy(sandboxPolicy); 798 m_AppDomains[appDomain] = sandbox;
727 799
728 m_AppDomains[appDomain] = sandbox; 800 m_AppDomains[appDomain].AssemblyResolve +=
729 801 new ResolveEventHandler(
730 m_AppDomains[appDomain].AssemblyResolve += 802 AssemblyResolver.OnAssemblyResolve);
731 new ResolveEventHandler( 803 m_DomainScripts[appDomain] = new List<UUID>();
732 AssemblyResolver.OnAssemblyResolve);
733 m_DomainScripts[appDomain] = new List<UUID>();
734 }
735 catch (Exception e)
736 {
737 m_log.ErrorFormat("[XEngine] Exception creating app domain:\n {0}", e.ToString());
738 m_ScriptErrorMessage += "Exception creating app domain:\n";
739 m_ScriptFailCount++;
740 lock (m_AddingAssemblies)
741 {
742 m_AddingAssemblies[assembly]--;
743 }
744 return false;
745 }
746 } 804 }
747 m_DomainScripts[appDomain].Add(itemID); 805 catch (Exception e)
748
749 instance = new ScriptInstance(this, part,
750 itemID, assetID, assembly,
751 m_AppDomains[appDomain],
752 part.ParentGroup.RootPart.Name,
753 item.Name, startParam, postOnRez,
754 stateSource, m_MaxScriptQueue);
755
756 m_log.DebugFormat("[XEngine] Loaded script {0}.{1}, script UUID {2}, prim UUID {3} @ {4}",
757 part.ParentGroup.RootPart.Name, item.Name, assetID, part.UUID, part.ParentGroup.RootPart.AbsolutePosition.ToString());
758
759 if (presence != null)
760 { 806 {
761 ShowScriptSaveResponse(item.OwnerID, 807 m_log.ErrorFormat("[XEngine] Exception creating app domain:\n {0}", e.ToString());
762 assetID, "Compile successful", true); 808 m_ScriptErrorMessage += "Exception creating app domain:\n";
809 m_ScriptFailCount++;
810 lock (m_AddingAssemblies)
811 {
812 m_AddingAssemblies[assembly]--;
813 }
814 return false;
763 } 815 }
816 }
817 m_DomainScripts[appDomain].Add(itemID);
764 818
765 instance.AppDomain = appDomain; 819 instance = new ScriptInstance(this, part,
766 instance.LineMap = linemap; 820 itemID, assetID, assembly,
821 m_AppDomains[appDomain],
822 part.ParentGroup.RootPart.Name,
823 item.Name, startParam, postOnRez,
824 stateSource, m_MaxScriptQueue);
767 825
768 m_Scripts[itemID] = instance; 826 m_log.DebugFormat("[XEngine] Loaded script {0}.{1}, script UUID {2}, prim UUID {3} @ {4}",
769 } 827 part.ParentGroup.RootPart.Name, item.Name, assetID, part.UUID, part.ParentGroup.RootPart.AbsolutePosition.ToString());
770 828
771 lock (m_PrimObjects) 829 if (presence != null)
772 { 830 {
773 if (!m_PrimObjects.ContainsKey(localID)) 831 ShowScriptSaveResponse(item.OwnerID,
774 m_PrimObjects[localID] = new List<UUID>(); 832 assetID, "Compile successful", true);
833 }
775 834
776 if (!m_PrimObjects[localID].Contains(itemID)) 835 instance.AppDomain = appDomain;
777 m_PrimObjects[localID].Add(itemID); 836 instance.LineMap = linemap;
837 lockScriptsForWrite(true);
838 m_Scripts[itemID] = instance;
839 lockScriptsForWrite(false);
840 }
841 else
842 {
843 lockScriptsForRead(false);
844 }
845 lock (m_PrimObjects)
846 {
847 if (!m_PrimObjects.ContainsKey(localID))
848 m_PrimObjects[localID] = new List<UUID>();
778 849
779 } 850 if (!m_PrimObjects[localID].Contains(itemID))
851 m_PrimObjects[localID].Add(itemID);
780 852
781 if (!m_Assemblies.ContainsKey(assetID)) 853 }
782 m_Assemblies[assetID] = assembly;
783 854
784 lock (m_AddingAssemblies) 855 if (!m_Assemblies.ContainsKey(assetID))
785 { 856 m_Assemblies[assetID] = assembly;
786 m_AddingAssemblies[assembly]--;
787 }
788 857
789 if (instance!=null) 858 lock (m_AddingAssemblies)
790 instance.Init(); 859 {
860 m_AddingAssemblies[assembly]--;
791 } 861 }
862
863 if (instance!=null)
864 instance.Init();
865
792 return true; 866 return true;
793 } 867 }
794 868
795 public void OnRemoveScript(uint localID, UUID itemID) 869 public void OnRemoveScript(uint localID, UUID itemID)
796 { 870 {
797 lock (m_Scripts) 871 lockScriptsForRead(true);
872 // Do we even have it?
873 if (!m_Scripts.ContainsKey(itemID))
798 { 874 {
799 // Do we even have it? 875 lockScriptsForRead(false);
800 if (!m_Scripts.ContainsKey(itemID)) 876 return;
801 return; 877 }
802 878
803 IScriptInstance instance=m_Scripts[itemID];
804 m_Scripts.Remove(itemID);
805 879
806 instance.ClearQueue(); 880 IScriptInstance instance=m_Scripts[itemID];
807 instance.Stop(0); 881 lockScriptsForRead(false);
882 lockScriptsForWrite(true);
883 m_Scripts.Remove(itemID);
884 lockScriptsForWrite(false);
885 instance.ClearQueue();
886 instance.Stop(0);
808 887
809// bool objectRemoved = false; 888// bool objectRemoved = false;
810 889
811 lock (m_PrimObjects) 890 lock (m_PrimObjects)
891 {
892 // Remove the script from it's prim
893 if (m_PrimObjects.ContainsKey(localID))
812 { 894 {
813 // Remove the script from it's prim 895 // Remove inventory item record
814 if (m_PrimObjects.ContainsKey(localID)) 896 if (m_PrimObjects[localID].Contains(itemID))
815 { 897 m_PrimObjects[localID].Remove(itemID);
816 // Remove inventory item record
817 if (m_PrimObjects[localID].Contains(itemID))
818 m_PrimObjects[localID].Remove(itemID);
819 898
820 // If there are no more scripts, remove prim 899 // If there are no more scripts, remove prim
821 if (m_PrimObjects[localID].Count == 0) 900 if (m_PrimObjects[localID].Count == 0)
822 { 901 {
823 m_PrimObjects.Remove(localID); 902 m_PrimObjects.Remove(localID);
824// objectRemoved = true; 903// objectRemoved = true;
825 }
826 } 904 }
827 } 905 }
906 }
828 907
829 instance.RemoveState(); 908 instance.RemoveState();
830 instance.DestroyScriptInstance(); 909 instance.DestroyScriptInstance();
831
832 m_DomainScripts[instance.AppDomain].Remove(instance.ItemID);
833 if (m_DomainScripts[instance.AppDomain].Count == 0)
834 {
835 m_DomainScripts.Remove(instance.AppDomain);
836 UnloadAppDomain(instance.AppDomain);
837 }
838 910
839 instance = null; 911 m_DomainScripts[instance.AppDomain].Remove(instance.ItemID);
912 if (m_DomainScripts[instance.AppDomain].Count == 0)
913 {
914 m_DomainScripts.Remove(instance.AppDomain);
915 UnloadAppDomain(instance.AppDomain);
916 }
840 917
841 ObjectRemoved handlerObjectRemoved = OnObjectRemoved; 918 instance = null;
842 if (handlerObjectRemoved != null)
843 {
844 SceneObjectPart part = m_Scene.GetSceneObjectPart(localID);
845 handlerObjectRemoved(part.UUID);
846 }
847 919
848 CleanAssemblies(); 920 ObjectRemoved handlerObjectRemoved = OnObjectRemoved;
921 if (handlerObjectRemoved != null)
922 {
923 SceneObjectPart part = m_Scene.GetSceneObjectPart(localID);
924 handlerObjectRemoved(part.UUID);
849 } 925 }
850 926
927 CleanAssemblies();
928
929
851 ScriptRemoved handlerScriptRemoved = OnScriptRemoved; 930 ScriptRemoved handlerScriptRemoved = OnScriptRemoved;
852 if (handlerScriptRemoved != null) 931 if (handlerScriptRemoved != null)
853 handlerScriptRemoved(itemID); 932 handlerScriptRemoved(itemID);
@@ -1099,12 +1178,14 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1099 private IScriptInstance GetInstance(UUID itemID) 1178 private IScriptInstance GetInstance(UUID itemID)
1100 { 1179 {
1101 IScriptInstance instance; 1180 IScriptInstance instance;
1102 lock (m_Scripts) 1181 lockScriptsForRead(true);
1182 if (!m_Scripts.ContainsKey(itemID))
1103 { 1183 {
1104 if (!m_Scripts.ContainsKey(itemID)) 1184 lockScriptsForRead(false);
1105 return null; 1185 return null;
1106 instance = m_Scripts[itemID];
1107 } 1186 }
1187 instance = m_Scripts[itemID];
1188 lockScriptsForRead(false);
1108 return instance; 1189 return instance;
1109 } 1190 }
1110 1191
@@ -1128,6 +1209,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1128 return false; 1209 return false;
1129 } 1210 }
1130 1211
1212 [DebuggerNonUserCode]
1131 public void ApiResetScript(UUID itemID) 1213 public void ApiResetScript(UUID itemID)
1132 { 1214 {
1133 IScriptInstance instance = GetInstance(itemID); 1215 IScriptInstance instance = GetInstance(itemID);
@@ -1179,6 +1261,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1179 return UUID.Zero; 1261 return UUID.Zero;
1180 } 1262 }
1181 1263
1264 [DebuggerNonUserCode]
1182 public void SetState(UUID itemID, string newState) 1265 public void SetState(UUID itemID, string newState)
1183 { 1266 {
1184 IScriptInstance instance = GetInstance(itemID); 1267 IScriptInstance instance = GetInstance(itemID);
@@ -1199,11 +1282,10 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1199 { 1282 {
1200 List<IScriptInstance> instances = new List<IScriptInstance>(); 1283 List<IScriptInstance> instances = new List<IScriptInstance>();
1201 1284
1202 lock (m_Scripts) 1285 lockScriptsForRead(true);
1203 { 1286 foreach (IScriptInstance instance in m_Scripts.Values)
1204 foreach (IScriptInstance instance in m_Scripts.Values)
1205 instances.Add(instance); 1287 instances.Add(instance);
1206 } 1288 lockScriptsForRead(false);
1207 1289
1208 foreach (IScriptInstance i in instances) 1290 foreach (IScriptInstance i in instances)
1209 { 1291 {
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 6403c1b..0d9dcc6 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -517,7 +517,7 @@ namespace OpenSim.Tests.Common.Mock
517 517
518 } 518 }
519 519
520 public void SendGenericMessage(string method, List<string> message) 520 public void SendGenericMessage(string method, List<byte[]> message)
521 { 521 {
522 522
523 } 523 }
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 020632f..a7e1351 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -400,6 +400,9 @@
400 400
401 ; Distance in meters that shouts should travel. Default is 100m 401 ; Distance in meters that shouts should travel. Default is 100m
402 shout_distance = 100 402 shout_distance = 100
403
404 ; Append a prefix to the god avatar names appearing in chat whilst in god mode
405 ; admin_prefix = "@"
403 406
404 407
405[Messaging] 408[Messaging]
@@ -771,6 +774,12 @@
771 ; default is 1000 774 ; default is 1000
772 cloud_update_rate = 1000 775 cloud_update_rate = 1000
773 776
777[Meta7Windlight]
778
779 ; This enables the transmission of Windlight scenes to supporting clients, such as the Meta7 viewer.
780 ; It has no ill effect on viewers which do not support server-side windlight settings.
781 ; Currently we only have support for MySQL databases.
782 enable_windlight = false;
774 783
775[Trees] 784[Trees]
776 ; Enable this to allow the tree module to manage your sim trees, including growing, reproducing and dying 785 ; Enable this to allow the tree module to manage your sim trees, including growing, reproducing and dying
@@ -925,6 +934,9 @@
925 934
926 ; Allow the use of os* functions (some are dangerous) 935 ; Allow the use of os* functions (some are dangerous)
927 AllowOSFunctions = false 936 AllowOSFunctions = false
937
938 ; Allow the user of Careminster functions
939 AllowCareminsterFunctions = false
928 940
929 ; Threat level to allow, one of None, VeryLow, Low, Moderate, High, VeryHigh, Severe 941 ; Threat level to allow, one of None, VeryLow, Low, Moderate, High, VeryHigh, Severe
930 OSFunctionThreatLevel = VeryLow 942 OSFunctionThreatLevel = VeryLow
@@ -1257,6 +1269,9 @@
1257; For example- http://127.0.0.1:9000/SStats/ 1269; For example- http://127.0.0.1:9000/SStats/
1258; enabled=false 1270; enabled=false
1259 1271
1272[LandManagement]
1273; DefaultAdministratorGroupUUID = "";
1274; DefaultAdministratorParcelName = "";
1260 1275
1261;; 1276;;
1262;; These are defaults that are overwritten below in [Architecture]. 1277;; These are defaults that are overwritten below in [Architecture].
diff --git a/prebuild.xml b/prebuild.xml
index e19e636..cdf1169 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -543,6 +543,36 @@
543 </Files> 543 </Files>
544 </Project> 544 </Project>
545 545
546 <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.ChOdePlugin" path="OpenSim/Region/Physics/ChOdePlugin" type="Library">
547 <Configuration name="Debug">
548 <Options>
549 <OutputPath>../../../../bin/Physics/</OutputPath>
550 </Options>
551 </Configuration>
552 <Configuration name="Release">
553 <Options>
554 <OutputPath>../../../../bin/Physics/</OutputPath>
555 </Options>
556 </Configuration>
557
558 <ReferencePath>../../../../bin/</ReferencePath>
559 <Reference name="System"/>
560 <Reference name="System.Core"/>
561 <Reference name="OpenMetaverseTypes.dll"/>
562 <Reference name="Nini.dll" />
563 <Reference name="OpenSim.Framework"/>
564 <Reference name="OpenSim.Framework.Console"/>
565 <Reference name="OpenSim.Region.Physics.Manager"/>
566 <Reference name="Ode.NET.dll" />
567 <Reference name="log4net.dll"/>
568
569 <Files>
570 <Match pattern="*.cs" recurse="true">
571 <Exclude name="Tests" pattern="Tests"/>
572 </Match>
573 </Files>
574 </Project>
575
546 <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.BulletXPlugin" path="OpenSim/Region/Physics/BulletXPlugin" type="Library"> 576 <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.BulletXPlugin" path="OpenSim/Region/Physics/BulletXPlugin" type="Library">
547 <Configuration name="Debug"> 577 <Configuration name="Debug">
548 <Options> 578 <Options>