aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorTeravus Ovares2008-03-25 16:09:43 +0000
committerTeravus Ovares2008-03-25 16:09:43 +0000
commit3d1b4f8578e4dc3df0436c1c13f1b2983d3b55e7 (patch)
tree0e6e421b696c94a8331c99782259ebce5a7b92d7 /OpenSim
parent* Refactored out circular reference in Region.Environment <-> Framework.Data.... (diff)
downloadopensim-SC_OLD-3d1b4f8578e4dc3df0436c1c13f1b2983d3b55e7.zip
opensim-SC_OLD-3d1b4f8578e4dc3df0436c1c13f1b2983d3b55e7.tar.gz
opensim-SC_OLD-3d1b4f8578e4dc3df0436c1c13f1b2983d3b55e7.tar.bz2
opensim-SC_OLD-3d1b4f8578e4dc3df0436c1c13f1b2983d3b55e7.tar.xz
* On Ray casting. Now returning the face normal of the collision face.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Communications/Capabilities/Caps.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/EntityBase.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs4
3 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs
index 194407f..cac0571 100644
--- a/OpenSim/Framework/Communications/Capabilities/Caps.cs
+++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs
@@ -455,7 +455,7 @@ namespace OpenSim.Region.Capabilities
455 // "ScriptTaskInventory response: {0}", 455 // "ScriptTaskInventory response: {0}",
456 // LLSDHelpers.SerialiseLLSDReply(uploadResponse))); 456 // LLSDHelpers.SerialiseLLSDReply(uploadResponse)));
457 457
458 return LLSDHelpers.SerialiseLLSDReply("<llsd><map><key>parcel_local_id</key><integer>16</integer><key>region_name</key><string>Limbo</string><key>voice_credentials</key><map><key>channel_uri</key><string>sip:confctl-49730-1@bhr.vivox.com</string></map></map></llsd>"); 458 return LLSDHelpers.SerialiseLLSDReply("<llsd><map><key>parcel_local_id</key><integer>16</integer><key>region_name</key><string>Teravus Test</string><key>voice_credentials</key><map><key>channel_uri</key><string>sip:conference@192.168.1.127\nsip:user@192.168.1.127</string></map></map></llsd>");
459 } 459 }
460 catch (Exception e) 460 catch (Exception e)
461 { 461 {
@@ -501,7 +501,7 @@ namespace OpenSim.Region.Capabilities
501 // "ScriptTaskInventory response: {0}", 501 // "ScriptTaskInventory response: {0}",
502 // LLSDHelpers.SerialiseLLSDReply(uploadResponse))); 502 // LLSDHelpers.SerialiseLLSDReply(uploadResponse)));
503 503
504 return LLSDHelpers.SerialiseLLSDReply("<llsd><map><key>events</key><array><map><key>body</key><map><key>major_version</key><integer>1</integer><key>minor_version</key><integer>0</integer><key>region_name</key><string>Cathedral</string></map><key>message</key><string>RequiredVoiceVersion</string></map></array><key>id</key><integer>152477222</integer></map></llsd>"); 504 return LLSDHelpers.SerialiseLLSDReply("<llsd><map><key>events</key><array><map><key>body</key><map><key>major_version</key><integer>1</integer><key>minor_version</key><integer>0</integer><key>region_name</key><string>Teravus Test</string></map><key>message</key><string>RequiredVoiceVersion</string></map></array><key>id</key><integer>152477222</integer></map></llsd>");
505 } 505 }
506 catch (Exception e) 506 catch (Exception e)
507 { 507 {
diff --git a/OpenSim/Region/Environment/Scenes/EntityBase.cs b/OpenSim/Region/Environment/Scenes/EntityBase.cs
index 713b205..c6a5b29 100644
--- a/OpenSim/Region/Environment/Scenes/EntityBase.cs
+++ b/OpenSim/Region/Environment/Scenes/EntityBase.cs
@@ -228,7 +228,7 @@ namespace OpenSim.Region.Environment.Scenes
228 public class EntityIntersection 228 public class EntityIntersection
229 { 229 {
230 public Vector3 ipoint = new Vector3(0, 0, 0); 230 public Vector3 ipoint = new Vector3(0, 0, 0);
231 public float normal = 0; 231 public Vector3 normal = new Vector3(0, 0, 0);
232 public bool HitTF = false; 232 public bool HitTF = false;
233 public SceneObjectPart obj; 233 public SceneObjectPart obj;
234 public float distance = 0; 234 public float distance = 0;
@@ -237,7 +237,7 @@ namespace OpenSim.Region.Environment.Scenes
237 { 237 {
238 } 238 }
239 239
240 public EntityIntersection(Vector3 _ipoint, float _normal, bool _HitTF) 240 public EntityIntersection(Vector3 _ipoint, Vector3 _normal, bool _HitTF)
241 { 241 {
242 ipoint = _ipoint; 242 ipoint = _ipoint;
243 normal = _normal; 243 normal = _normal;
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 2c65a8f..acb2588 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -953,7 +953,7 @@ namespace OpenSim.Region.Environment.Scenes
953 953
954 // Normal is calculated by the difference and then normalizing the result 954 // Normal is calculated by the difference and then normalizing the result
955 Vector3 normalpart = ipoint - vAbsolutePosition; 955 Vector3 normalpart = ipoint - vAbsolutePosition;
956 returnresult.normal = normalpart.Normalize(); 956 returnresult.normal = normalpart / normalpart.Length;
957 957
958 // It's funny how the LLVector3 object has a Distance function, but the Axiom.Math object doesnt. 958 // It's funny how the LLVector3 object has a Distance function, but the Axiom.Math object doesnt.
959 // I can write a function to do it.. but I like the fact that this one is Static. 959 // I can write a function to do it.. but I like the fact that this one is Static.
@@ -1261,7 +1261,7 @@ namespace OpenSim.Region.Environment.Scenes
1261 returnresult.HitTF = true; 1261 returnresult.HitTF = true;
1262 returnresult.ipoint = q; 1262 returnresult.ipoint = q;
1263 //m_log.Info("[POINT]: " + q.ToString()); 1263 //m_log.Info("[POINT]: " + q.ToString());
1264 returnresult.normal = 1; 1264 returnresult.normal = normals[i];
1265 1265
1266 } 1266 }
1267 } 1267 }