aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-07-181-1/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs OpenSim/Services/HypergridService/UserAgentService.cs
| * minor: remove some mono compiler warnings in OdePluginJustin Clark-Casey (justincc)2013-07-081-1/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-11-301-0/+5
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs OpenSim/Region/Physics/Meshing/Meshmerizer.cs
| * Stop logging spurious asset data for {0} is zero length error for sculpts/meshJustin Clark-Casey (justincc)2012-11-281-0/+5
| | | | | | | | | | | | | | | | ODEPrim, for instance, always hits this code path twice at the moment Firstly before any sculpt data has been loaded (hence the spurious message) Secondly when any sculpt data has been loaded or failed to load (when the message would be valid). Hence comment this out and rely on the message in ODEPrim.MeshAssetReceived() instead (though this is not ideal since it requires all physics plugins to copy/paste similar code).
* | Merge branch 'master' into careminsterMelanie2012-10-311-1/+7
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/ChildAgentDataUpdate.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Log warning if mesh/sculpt asset couldn't be found by ↵Justin Clark-Casey (justincc)2012-10-301-0/+6
| | | | | | | | | | | | ODEPrim.MeshAssetReceived() callback. Presumably this is now more useful if the false positive from the old method of loading mesh assets have been eliminated.
| * Add asset != null check to ODEPrim.MeshAssetReceived instead of throwing ↵Justin Clark-Casey (justincc)2012-10-301-1/+1
| | | | | | | | | | | | exception. In some cases (such as failure to receive response from asset service), it is possible for a null to be returned from IAssetService.Get(string, object, AssetRetrieved).
* | Merge branch 'master' into careminsterMelanie2012-10-301-3/+2
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Make MeshAssetReceived private.Justin Clark-Casey (justincc)2012-10-301-1/+1
| | | | | | | | Keep methods private unless they need to be opened up to external callers. Reduces analysis complexity.
| * correct ODEPrim.MeshAssetReveived -> MeshAssetReceivedJustin Clark-Casey (justincc)2012-10-301-3/+2
| |
* | Merge branch 'avination' into careminsterMelanie2012-10-281-7/+13
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
| * | [UNTESTED] core Ode: let broken mesh physical prims collide with land asUbitUmarov2012-10-191-6/+11
| | | | | | | | | | | | the defaul basic box so they don't go off world.
| * | [UNTESTED] core Ode: stop trying to load a broken asset. Make brokenUbitUmarov2012-10-191-21/+97
| | | | | | | | | | | | assets behave like phantom by Nebadon request
* | | Merge branch 'master' into careminsterMelanie2012-10-231-12/+14
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Framework/LandData.cs
| * | minor: remove unnecessary bit of method doc from ↵Justin Clark-Casey (justincc)2012-10-201-3/+0
| | | | | | | | | | | | OdePrim.BadMeshAssetCollideBits that monodevelop inserted automatically
| * | Fix minor issues from commit 28483150Justin Clark-Casey (justincc)2012-10-201-12/+17
| | | | | | | | | | | | Fix spelling of collide, change to more self-documenting property BadMeshAssetCollideBits, add method doc, change to private to reduce code analysis complexity
* | | Merge branch 'master' into careminsterMelanie2012-10-191-6/+11
|\ \ \ | |/ /
| * | [UNTESTED] core Ode: let broken mesh physical prims collide with land asUbitUmarov2012-10-191-6/+11
| | | | | | | | | | | | the defaul basic box so they don't go off world.
* | | Merge branch 'master' into careminsterMelanie2012-10-191-21/+97
|\ \ \ | |/ /
| * | [UNTESTED] core Ode: stop trying to load a broken asset. Make brokenUbitUmarov2012-10-191-21/+97
| | | | | | | | | | | | assets behave like phantom by Nebadon request
| * | i update core ode plugin and make it load is meshs (i hope)UbitUmarov2012-10-181-1/+50
| | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
* | | Merge branch 'avination' into careminsterMelanie2012-10-181-3/+52
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/Physics/OdePlugin/OdeScene.cs
| * | i update core ode plugin and make it load is meshs (i hope)UbitUmarov2012-10-071-9/+81
| | |
* | | Merge branch 'master' into careminsterMelanie2012-10-041-2/+11
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
| * | Soliciting for comments on smoothness of physics objects for this build.teravus2012-10-031-2/+11
| | | | | | | | | | | | | | | This introduces expected contact point hints to the ODE Collider to better determine when to throttle updates as excessive. This /should/ smooth physics objects out again, however, I cannot know every configuration of OpenSimulator, so I'm requesting that testers please examine this change on their build. Thanks!
* | | Merge branch 'master' into careminsterMelanie2012-10-031-5/+19
|\ \ \ | |/ / | | / | |/ |/|
| * I propose that 0.5m/step change for linear velocity is too big of a change ↵teravus2012-10-031-1/+15
| | | | | | | | to control the reporting of a new angular velocity. I think that this could be here for one of two reasons, 1. vehicles and llMoveToTarget with axis lock, or 2. To attempt to make things look more stable in the physics scene then they really are, however, this also really affects the angular velocity reporting negatively causing things to spin wildly and jump back into place repeatedly. To compromise, if the prim is a vehicle or is being used as a motor target, the original functionality is still applied. If that's not the case, angular velocity is reported with a linear velocity of 0.02m/step. To be clear on the effect of the physical world... When you push things, there's still a lag time where you walk into the object but once the object is in motion, it begins to move as you would expect so results in slightly more realistic motion.
| * Minor Modification, switch /2 to 0.5f in ODEPrim.Velocityteravus2012-10-021-4/+4
| |
* | Merge branch 'master' into careminsterMelanie2012-04-241-0/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Restore _parent_scene.actor_name_map[prim_geom] = this; accidentally removed ↵Justin Clark-Casey (justincc)2012-04-241-0/+1
| | | | | | | | | | | | | | | | from ODEPrim.SetGeom. This occurred in 7a574be3fd from Sat 21 Apr 2012. This should fix collision detection. Mnay thanks to tglion for the spot and the fix in http://opensimulator.org/mantis/view.php?id=5988
* | Merge branch 'master' into careminsterMelanie2012-04-221-237/+220
|\ \ | |/
| * Comment out spurious Body != IntPtr.Zero code after disableBody(), since ↵Justin Clark-Casey (justincc)2012-04-211-9/+18
| | | | | | | | disableBody() sets Body == IntPtr.Zero on all code paths.
| * refactor: Simplify ODEPrim.AddChildPrim() by returning early where appropriate.Justin Clark-Casey (justincc)2012-04-211-115/+117
| |
| * Remove redundant prim_geom != IntPtr.Zero checks in ODEPrim.Justin Clark-Casey (justincc)2012-04-211-116/+88
| | | | | | | | | | | | prim_geom == IntPtr.Zero only before a new add prim taint is processed (which is the first taint) or in operations such as scale change which are done in taint or under lock. Therefore, we can remove these checks which were not consistently applied anyway. If there is a genuine problem, better to see it quickly in a NullReferenceException than hide the bug.
* | Merge branch 'master' into careminsterMelanie2012-04-201-12/+10
|\ \ | |/
| * If a physical prim is manually moved (e.g. by a user) then set the geometry ↵Justin Clark-Casey (justincc)2012-04-201-12/+10
| | | | | | | | | | | | | | position as well as the body position This is necessary to stop the moved prim snapping back to the original position on deselection if moved only once This resolves http://opensimulator.org/mantis/view.php?id=5966
* | Merge branch 'master' into careminsterMelanie2012-03-201-10/+16
|\ \ | |/ | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLXAssetData.cs
| * Fix crash where two scene loop threads could changes m_MeshToTriMeshMap at ↵Justin Clark-Casey (justincc)2012-03-201-10/+16
| | | | | | | | | | | | the same time. Have to lock m_MeshToTriMeshMap as property is static and with more than one region two scene loops could try to manipulate at the same time.
* | Merge branch 'master' into careminsterMelanie2012-02-241-0/+2
|\ \ | |/
| * Stop spurious scene loop startup timeout alarms for scenes with many prims.Justin Clark-Casey (justincc)2012-02-241-0/+2
| | | | | | | | | | | | | | | | On the first frame, all startup scene objects are added to the physics scene. This can cause a considerable delay, so we don't start raising the alarm on scene loop timeouts until the second frame. This commit also slightly changes the behaviour of timeout reporting. Previously, a report was made for the very first timed out thread, ignoring all others until the next watchdog check. Instead, we now report every timed out thread, though we still only do this once no matter how long the timeout.
| * Remove unused SetAcceleration and add set on Acceleration parameterDan Lake2011-12-201-0/+1
| |
* | Merge branch 'master' into careminsterMelanie2011-12-221-0/+1
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Remove unused SetAcceleration and add set on Acceleration parameterDan Lake2011-12-201-0/+1
| |/
* | Merge branch 'master' into bigmergeMelanie2011-11-241-11/+9
|\ \ | |/
| * slightly simplify OdeScene.Simulate() by removing bool processtaints, since ↵Justin Clark-Casey (justincc)2011-11-221-1/+0
| | | | | | | | | | | | we can inspect count of taint lists instead. also groups OdeCharacter.CreateOdeStructures() and DestroyOdeStructures() together
| * Comment out calls to OdeScene.waitForSpaceUnlock() since that method does ↵Justin Clark-Casey (justincc)2011-11-211-9/+9
| | | | | | | | nothing right now
| * Have ODECharacter and ODEPrim both use PhysicsActor.Name instead of ↵Justin Clark-Casey (justincc)2011-11-211-1/+0
| | | | | | | | maintaining their own properties
* | Merge branch 'master' into bigmergeMelanie2011-11-171-10/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
| * Stop OdePrim and OdeCharacter insanely overriding set LocalID to set their ↵Justin Clark-Casey (justincc)2011-11-161-10/+1
| | | | | | | | | | | | | | own private m_localID property but leaving get to return the then unset PhysicsActor.LocalId! Instead, just have both subclasses use the PhysicsActor.LocalID property. This restores collision functionality that fell away in 45c7789 yesterday
* | Merge branch 'master' into bigmergeMelanie2011-11-051-0/+3
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
generated by cgit v1.1 at 2024-12-25 23:34:07 +0000