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

map image service: always try to delete a map tile, before saving a new one; ubode cosmetics that where on disk"

Browse Source
This commit is contained in:
UbitUmarov
2022-08-14 00:23:16 +01:00
parent 7b334bc7d8
commit aad0c3c60e
4 changed files with 91 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/PhysicsModules/ubOde/ODECharacter.cs
View File

@@ -850,7 +850,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
AvaAvaSizeYsq = 0.5f * sy;
AvaAvaSizeYsq *= AvaAvaSizeYsq;
m_parent_scene.waitForSpaceUnlock(m_parent_scene.CharsSpace);
//m_parent_scene.waitForSpaceUnlock(m_parent_scene.CharsSpace);
//collider = SafeNativeMethods.SimpleSpaceCreate(m_parent_scene.CharsSpace);
//SafeNativeMethods.SpaceSetSublevel(collider, 0);
@@ -962,7 +962,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
if (capsule != IntPtr.Zero)
{
m_parent_scene.actor_name_map.Remove(capsule);
m_parent_scene.waitForSpaceUnlock(collider);
//m_parent_scene.waitForSpaceUnlock(collider);
SafeNativeMethods.GeomDestroy(capsule);
capsule = IntPtr.Zero;
}
@@ -976,7 +976,7 @@ namespace OpenSim.Region.PhysicsModule.ubOde
if (collider != IntPtr.Zero)
{
m_parent_scene.actor_name_map.Remove(collider);
m_parent_scene.waitForSpaceUnlock(m_parent_scene.CharsSpace);
//m_parent_scene.waitForSpaceUnlock(m_parent_scene.CharsSpace);
SafeNativeMethods.GeomDestroy(collider);
collider = IntPtr.Zero;
}
@@ -992,13 +992,13 @@ namespace OpenSim.Region.PhysicsModule.ubOde
x = tx * cos - y * sin;
y = tx * sin + y * cos;
}
public void RotateXYonZ(ref float x, ref float y, ref float sin, ref float cos)
public void RotateXYonZ(ref float x, ref float y, float sin, float cos)
{
float tx = x;
x = tx * cos - y * sin;
y = tx * sin + y * cos;
}
public void invRotateXYonZ(ref float x, ref float y, ref float sin, ref float cos)
public void invRotateXYonZ(ref float x, ref float y, float sin, float cos)
{
float tx = x;
x = tx * cos + y * sin;