From a1fcfe867786de121d0960e684252525781ac453 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Sun, 7 Oct 2012 23:54:15 +0100 Subject: [PATCH] a few changes/fix (?) --- .../Region/Physics/UbitMeshing/Meshmerizer.cs | 18 +-- .../Physics/UbitOdePlugin/ODEMeshWorker.cs | 150 +++++++++--------- .../Region/Physics/UbitOdePlugin/ODEPrim.cs | 50 +++--- .../Region/Physics/UbitOdePlugin/OdeScene.cs | 11 -- 4 files changed, 112 insertions(+), 117 deletions(-) diff --git a/OpenSim/Region/Physics/UbitMeshing/Meshmerizer.cs b/OpenSim/Region/Physics/UbitMeshing/Meshmerizer.cs index 2933d864dd..fabadd3304 100644 --- a/OpenSim/Region/Physics/UbitMeshing/Meshmerizer.cs +++ b/OpenSim/Region/Physics/UbitMeshing/Meshmerizer.cs @@ -1113,17 +1113,17 @@ namespace OpenSim.Region.Physics.Meshing Mesh mesh = (Mesh)imesh; - int curRefCount = mesh.RefCount; - curRefCount--; - - if (curRefCount > 0) - { - mesh.RefCount = curRefCount; - return; - } - lock (m_uniqueMeshes) { + int curRefCount = mesh.RefCount; + curRefCount--; + + if (curRefCount > 0) + { + mesh.RefCount = curRefCount; + return; + } + mesh.RefCount = 0; m_uniqueMeshes.Remove(mesh.Key); lock (m_uniqueReleasedMeshes) diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODEMeshWorker.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODEMeshWorker.cs index 6bdc08938d..024835cb58 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/ODEMeshWorker.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/ODEMeshWorker.cs @@ -18,6 +18,23 @@ using OpenMetaverse; namespace OpenSim.Region.Physics.OdePlugin { + public enum MeshState : byte + { + noNeed = 0, + + loadingAsset = 1, + + AssetOK = 0x0f, // 00001111 + + NeedMask = 0x30, // 00110000 + needMesh = 0x10, // 00010000 + needAsset = 0x20, // 00100000 + + FailMask = 0xC0, // 11000000 + AssetFailed = 0x40, // 01000000 + MeshFailed = 0x80 // 10000000 + } + public enum meshWorkerCmnds : byte { nop = 0, @@ -43,13 +60,11 @@ namespace OpenSim.Region.Physics.OdePlugin public byte shapetype; public bool hasOBB; public bool hasMeshVolume; - public AssetState assetState; + public MeshState meshState; public UUID? assetID; public meshWorkerCmnds comand; } - - public class ODEMeshWorker { @@ -138,16 +153,10 @@ namespace OpenSim.Region.Physics.OdePlugin repData.size = size; repData.shapetype = shapetype; - // if (CheckMeshDone(repData)) - { - CheckMeshDone(repData); - CalcVolumeData(repData); - m_scene.AddChange(actor, changes.PhysRepData, repData); - return; - } - -// repData.comand = meshWorkerCmnds.changefull; -// createqueue.Enqueue(repData); + CheckMeshDone(repData); + CalcVolumeData(repData); + m_scene.AddChange(actor, changes.PhysRepData, repData); + return; } public void NewActorPhysRep(PhysicsActor actor, PrimitiveBaseShape pbs, @@ -159,39 +168,43 @@ namespace OpenSim.Region.Physics.OdePlugin repData.size = size; repData.shapetype = shapetype; - // bool done = CheckMeshDone(repData); - CheckMeshDone(repData); CalcVolumeData(repData); m_scene.AddChange(actor, changes.AddPhysRep, repData); -// if (done) - return; - -// repData.comand = meshWorkerCmnds.addnew; -// createqueue.Enqueue(repData); } - public void RequestMeshAsset(ODEPhysRepData repData) + public void RequestMesh(ODEPhysRepData repData) { - if (repData.assetState != AssetState.needAsset) - return; - repData.mesh = null; - if (repData.assetID == null || repData.assetID == UUID.Zero) + if (repData.meshState == MeshState.needMesh) { - repData.assetState = AssetState.noNeedAsset; repData.comand = meshWorkerCmnds.changefull; createqueue.Enqueue(repData); - return; } + else if (repData.meshState == MeshState.needAsset) + { + PrimitiveBaseShape pbs = repData.pbs; - repData.assetState = AssetState.loadingAsset; + // check if we got outdated - repData.comand = meshWorkerCmnds.getmesh; - createqueue.Enqueue(repData); + if (!pbs.SculptEntry || pbs.SculptTexture == UUID.Zero) + { + repData.meshState = MeshState.noNeed; + return; + } + + if (pbs.SculptTexture != repData.assetID) + return; + + repData.meshState = MeshState.loadingAsset; + + repData.comand = meshWorkerCmnds.getmesh; + createqueue.Enqueue(repData); + } } + // creates and prepares a mesh to use and calls parameters estimation public bool CreateActorPhysRep(ODEPhysRepData repData) { getMesh(repData); @@ -210,7 +223,7 @@ namespace OpenSim.Region.Physics.OdePlugin { m_log.WarnFormat("[PHYSICS]: Invalid mesh data on prim {0} mesh UUID {1}", repData.actor.Name, repData.pbs.SculptTexture.ToString()); - repData.assetState = AssetState.AssetFailed; + repData.meshState = MeshState.MeshFailed; repData.hasOBB = false; repData.mesh = null; m_scene.mesher.ReleaseMesh(mesh); @@ -237,6 +250,8 @@ namespace OpenSim.Region.Physics.OdePlugin createqueue.Enqueue(repData); } } + else + repData.pbs.SculptData = Utils.EmptyBytes; } public void DoRepDataGetMesh(ODEPhysRepData repData) @@ -244,7 +259,7 @@ namespace OpenSim.Region.Physics.OdePlugin if (!repData.pbs.SculptEntry) return; - if (repData.assetState != AssetState.loadingAsset) + if (repData.meshState != MeshState.loadingAsset) return; if (repData.assetID == null || repData.assetID == UUID.Zero) @@ -381,34 +396,19 @@ namespace OpenSim.Region.Physics.OdePlugin return true; } + // see if we need a mesh and if so if we have a cached one + // called with a new repData public bool CheckMeshDone(ODEPhysRepData repData) { PhysicsActor actor = repData.actor; PrimitiveBaseShape pbs = repData.pbs; - repData.mesh = null; - repData.hasOBB = false; - if (!needsMeshing(pbs)) { - repData.assetState = AssetState.noNeedAsset; + repData.meshState = MeshState.noNeed; return true; } - if (pbs.SculptEntry) - { - if (repData.assetState == AssetState.AssetFailed) - { - if (pbs.SculptTexture == repData.assetID) - return true; - } - } - else - { - repData.assetState = AssetState.noNeedAsset; - repData.assetID = null; - } - IMesh mesh = null; Vector3 size = repData.size; @@ -425,7 +425,9 @@ namespace OpenSim.Region.Physics.OdePlugin if (pbs.SculptType != (byte)SculptType.Mesh) clod = (int)LevelOfDetail.Low; } + mesh = m_mesher.GetMesh(actor.Name, pbs, size, clod, true, convex); + if (mesh == null) { if (pbs.SculptEntry) @@ -433,13 +435,13 @@ namespace OpenSim.Region.Physics.OdePlugin if (pbs.SculptTexture != null && pbs.SculptTexture != UUID.Zero) { repData.assetID = pbs.SculptTexture; - repData.assetState = AssetState.needAsset; + repData.meshState = MeshState.needAsset; } else - repData.assetState = AssetState.AssetFailed; + repData.meshState = MeshState.MeshFailed; } else - repData.assetState = AssetState.needAsset; + repData.meshState = MeshState.needMesh; return false; } @@ -447,14 +449,14 @@ namespace OpenSim.Region.Physics.OdePlugin repData.mesh = mesh; if (pbs.SculptEntry) { - repData.assetState = AssetState.AssetOK; + repData.meshState = MeshState.AssetOK; repData.assetID = pbs.SculptTexture; - pbs.SculptData = Utils.EmptyBytes; } + + pbs.SculptData = Utils.EmptyBytes; return true; } - public bool getMesh(ODEPhysRepData repData) { PhysicsActor actor = repData.actor; @@ -467,16 +469,19 @@ namespace OpenSim.Region.Physics.OdePlugin if (!needsMeshing(pbs)) return false; + if (repData.meshState == MeshState.MeshFailed) + return false; + if (pbs.SculptEntry) { - if (repData.assetState == AssetState.AssetFailed) + if (repData.meshState == MeshState.AssetFailed) { if (pbs.SculptTexture == repData.assetID) return true; } } - repData.assetState = AssetState.noNeedAsset; + repData.meshState = MeshState.noNeed; IMesh mesh = null; Vector3 size = repData.size; @@ -492,7 +497,10 @@ namespace OpenSim.Region.Physics.OdePlugin if (pbs.SculptType != (byte)SculptType.Mesh) clod = (int)LevelOfDetail.Low; } + + // check cached mesh = m_mesher.GetMesh(actor.Name, pbs, size, clod, true, convex); + if (mesh == null) { if (pbs.SculptEntry) @@ -501,17 +509,16 @@ namespace OpenSim.Region.Physics.OdePlugin return false; repData.assetID = pbs.SculptTexture; - repData.assetState = AssetState.AssetOK; + repData.meshState = MeshState.AssetOK; if (pbs.SculptData == null || pbs.SculptData.Length == 0) { - repData.assetState = AssetState.needAsset; + repData.meshState = MeshState.needAsset; return false; } } mesh = m_mesher.CreateMesh(actor.Name, pbs, size, clod, true, convex); - } repData.mesh = mesh; @@ -520,13 +527,14 @@ namespace OpenSim.Region.Physics.OdePlugin if (mesh == null) { if (pbs.SculptEntry) - repData.assetState = AssetState.AssetFailed; + repData.meshState = MeshState.AssetFailed; + else + repData.meshState = MeshState.MeshFailed; return false; } - if (pbs.SculptEntry) - repData.assetState = AssetState.AssetOK; + repData.meshState = MeshState.AssetOK; return true; } @@ -866,7 +874,7 @@ namespace OpenSim.Region.Physics.OdePlugin m_log = plog; repData = pRepData; - repData.assetState = AssetState.AssetFailed; + repData.meshState = MeshState.AssetFailed; if (provider == null) return; @@ -877,29 +885,27 @@ namespace OpenSim.Region.Physics.OdePlugin if (assetID == UUID.Zero) return; - repData.assetState = AssetState.loadingAsset; + repData.meshState = MeshState.loadingAsset; provider(assetID, ODEassetReceived); } void ODEassetReceived(AssetBase asset) { - repData.assetState = AssetState.AssetFailed; + repData.meshState = MeshState.AssetFailed; if (asset != null) { if (asset.Data != null && asset.Data.Length > 0) { + repData.meshState = MeshState.noNeed; + if (!repData.pbs.SculptEntry) return; if (repData.pbs.SculptTexture != repData.assetID) return; - // asset get may return a pointer to the same asset data - // for similar prims and we destroy with it - // so waste a lot of time stressing gc and hoping it clears things - // TODO avoid this repData.pbs.SculptData = new byte[asset.Data.Length]; asset.Data.CopyTo(repData.pbs.SculptData,0); - repData.assetState = AssetState.AssetOK; + repData.meshState = MeshState.AssetOK; m_worker.AssetLoaded(repData); } else diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs index 4c16f8eb57..c2c4384efb 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs @@ -146,7 +146,7 @@ namespace OpenSim.Region.Physics.OdePlugin private PrimitiveBaseShape _pbs; private UUID? m_assetID; - private AssetState m_assetState; + private MeshState m_meshState; public OdeScene _parent_scene; @@ -1341,15 +1341,18 @@ namespace OpenSim.Region.Physics.OdePlugin if (vertexCount == 0 || indexCount == 0) { - m_log.WarnFormat("[PHYSICS]: Invalid mesh data on OdePrim {0} mesh UUID {1}", - Name, _pbs.SculptTexture.ToString()); + m_log.WarnFormat("[PHYSICS]: Invalid mesh data on OdePrim {0}, mesh {1}", + Name, _pbs.SculptEntry ? _pbs.SculptTexture.ToString() : "primMesh"); + m_hasOBB = false; m_OBBOffset = Vector3.Zero; m_OBB = _size * 0.5f; + m_physCost = 0.1f; m_streamCost = 1.0f; + _parent_scene.mesher.ReleaseMesh(mesh); - m_assetState = AssetState.AssetFailed; + m_meshState = MeshState.MeshFailed; m_mesh = null; return false; } @@ -1360,7 +1363,7 @@ namespace OpenSim.Region.Physics.OdePlugin d.GeomTriMeshDataBuildSimple(_triMeshData, vertices, vertexStride, vertexCount, indices, indexCount, triStride); d.GeomTriMeshDataPreprocess(_triMeshData); - prim_geom = d.CreateTriMesh(IntPtr.Zero, _triMeshData, null, null, null); + prim_geom = d.CreateTriMesh(m_targetSpace, _triMeshData, null, null, null); } catch (Exception e) @@ -1385,7 +1388,7 @@ namespace OpenSim.Region.Physics.OdePlugin m_physCost = 0.1f; m_streamCost = 1.0f; _parent_scene.mesher.ReleaseMesh(mesh); - m_assetState = AssetState.AssetFailed; + m_meshState = MeshState.AssetFailed; m_mesh = null; return false; } @@ -1404,7 +1407,7 @@ namespace OpenSim.Region.Physics.OdePlugin m_NoColide = false; - if (m_assetState == AssetState.AssetFailed) + if ((m_meshState & MeshState.FailMask) != 0) m_NoColide = true; else if(m_mesh != null) @@ -1422,7 +1425,7 @@ namespace OpenSim.Region.Physics.OdePlugin { // it's a sphere try { - geo = d.CreateSphere(IntPtr.Zero, _size.X * 0.5f); + geo = d.CreateSphere(m_targetSpace, _size.X * 0.5f); } catch (Exception e) { @@ -1434,7 +1437,7 @@ namespace OpenSim.Region.Physics.OdePlugin {// do it as a box try { - geo = d.CreateBox(IntPtr.Zero, _size.X, _size.Y, _size.Z); + geo = d.CreateBox(m_targetSpace, _size.X, _size.Y, _size.Z); } catch (Exception e) { @@ -2748,7 +2751,7 @@ namespace OpenSim.Region.Physics.OdePlugin m_mesh = repData.mesh; m_assetID = repData.assetID; - m_assetState = repData.assetState; + m_meshState = repData.meshState; m_hasOBB = repData.hasOBB; m_OBBOffset = repData.OBBOffset; @@ -2781,12 +2784,12 @@ namespace OpenSim.Region.Physics.OdePlugin else MakeBody(); - if (m_assetState == AssetState.needAsset) + if ((m_meshState & MeshState.NeedMask) != 0) { repData.size = _size; repData.pbs = _pbs; repData.shapetype = m_shapetype; - _parent_scene.m_meshWorker.RequestMeshAsset(repData); + _parent_scene.m_meshWorker.RequestMesh(repData); } } } @@ -2820,7 +2823,7 @@ namespace OpenSim.Region.Physics.OdePlugin m_mesh = repData.mesh; m_assetID = repData.assetID; - m_assetState = repData.assetState; + m_meshState = repData.meshState; m_hasOBB = repData.hasOBB; m_OBBOffset = repData.OBBOffset; @@ -2832,12 +2835,9 @@ namespace OpenSim.Region.Physics.OdePlugin if (prim_geom != IntPtr.Zero) { - m_targetSpace = IntPtr.Zero; - UpdatePrimBodyData(); - _parent_scene.actor_name_map[prim_geom] = this; - + _parent_scene.actor_name_map[prim_geom] = this; d.GeomSetPosition(prim_geom, _position.X, _position.Y, _position.Z); d.Quaternion myrot = new d.Quaternion(); @@ -2847,7 +2847,6 @@ namespace OpenSim.Region.Physics.OdePlugin myrot.W = _orientation.W; d.GeomSetQuaternion(prim_geom, ref myrot); - if (m_isphysical) { if (chp) @@ -2869,13 +2868,14 @@ namespace OpenSim.Region.Physics.OdePlugin } resetCollisionAccounting(); - if (m_assetState == AssetState.needAsset) - { - repData.size = _size; - repData.pbs = _pbs; - repData.shapetype = m_shapetype; - _parent_scene.m_meshWorker.RequestMeshAsset(repData); - } + } + + if ((m_meshState & MeshState.NeedMask) != 0) + { + repData.size = _size; + repData.pbs = _pbs; + repData.shapetype = m_shapetype; + _parent_scene.m_meshWorker.RequestMesh(repData); } } diff --git a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs index 5e4c2a503e..ed2a531f55 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/OdeScene.cs @@ -111,17 +111,6 @@ namespace OpenSim.Region.Physics.OdePlugin light = 7 // compatibility with old viewers } - public enum AssetState : byte - { - noNeedAsset = 0, - needAsset = 1, - loadingAsset = 2, - procAsset = 3, - AssetOK = 4, - - AssetFailed = 0xff - } - public enum changes : int { Add = 0, // arg null. finishs the prim creation. should be used internally only ( to remove later ?)