Commit Graph

49 Commits

Author SHA1 Message Date
Melanie Thielker
b16abc8166 Massive tab and trailing space cleanup 2017-01-05 19:07:37 +00:00
UbitUmarov
1507c5230b remove a gc.collect that isn't very usefull (on the right engine this
time)
2016-12-30 05:15:50 +00:00
UbitUmarov
ee485187db remove a gc.collect that isn't very usefull 2016-12-30 04:57:34 +00:00
UbitUmarov
6c6a965320 remove some MegaRegions code from physics 2016-09-01 16:15:51 +01:00
UbitUmarov
133fce98e7 change ODEs topcolliders code ( still bad), plus a few memory leaks 2016-08-22 20:28:15 +01:00
UbitUmarov
2ebccbcd08 add EngineName also to old ODE 2016-07-04 08:55:19 +01:00
Diva Canto
ab12a14279 Pushed AssemblyVersion up to VersionInfo, so that we don't need to do global replace anymore. 2016-02-21 11:14:02 -08:00
UbitUmarov
82e464cb8c let old ODE trigger collision sounds like ubOde 2015-11-28 23:44:53 +00:00
UbitUmarov
f59350a1ee add a nasty global lock, ode.dll requires on multi regions per instance ( also make sure ninjaJoints are disabled 2015-11-27 22:50:28 +00:00
UbitUmarov
11342314e1 add thread allocation calls for new ode.dll (old ode) 2015-11-21 02:53:35 +00:00
UbitUmarov
0b36d4ea2f some cleanup, allow cast rays to collide with terrain within limited range (old ode) 2015-11-21 02:14:19 +00:00
UbitUmarov
36426b0db2 remove some compile warnings increasing total number by 2 2015-11-21 00:49:43 +00:00
UbitUmarov
019d057563 stop the Vehicle AFTER fixing position not before, bc stop code also updates position (old ode) 2015-11-20 19:40:04 +00:00
UbitUmarov
395d160c41 stop a Vehicle on a failed region cross (or empty border) (old ode) 2015-11-20 19:11:26 +00:00
UbitUmarov
53895289a6 remove Ode.Net - missing file. ( old ode may be broken now) 2015-11-20 18:48:48 +00:00
UbitUmarov
25983c1ba9 remove the hard to maintain Ode.Net wrapper only in use by old ode 2015-11-20 18:25:56 +00:00
UbitUmarov
72684592ba Merge branch 'master' into avinationmerge
Conflicts:
	OpenSim/Framework/AvatarAppearance.cs
	OpenSim/Framework/Servers/ServerBase.cs
	OpenSim/Framework/VersionInfo.cs
	OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
	OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
	OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
	OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs
	OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
	OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
	OpenSim/Services/HypergridService/GatekeeperService.cs
	OpenSim/Services/Interfaces/IAvatarService.cs
	OpenSim/Services/LLLoginService/LLLoginService.cs
2015-11-01 03:01:59 +00:00
UbitUmarov
8ed17f745d let ode also finish internal representation of prim actors, before simulation 2015-10-22 18:03:49 +01:00
UbitUmarov
44deac4c1e we do not have prims with size 2^128, missing file 2015-10-21 01:41:04 +01:00
UbitUmarov
c37ea1910d fix or remove some wrong ODE configuration settings 2015-10-21 01:11:39 +01:00
UbitUmarov
ce5d5fc8dc the inertia matrix inversions and body inertia changes to implement axis locks need to be avoid, so use ubOde axis locks code. Hopefully this will not cause incompatibilities 2015-10-21 00:01:23 +01:00
UbitUmarov
747044f587 stop using a vector3 to store axis locks 3bit flags also in ode 2015-10-20 23:57:57 +01:00
UbitUmarov
a31e5e799e stop a object when making it not physical 2015-10-18 00:35:52 +01:00
UbitUmarov
24435cfe9a Fix wrong active angularlock detection (it was only burning cpu), stop trying to add a amotor to each child prim and stop using unnecessary trimeshcallbacks 2015-10-17 21:56:15 +01:00
UbitUmarov
e2d7e6290d fix GetTerrainHeightAtXY also on master. Fix wrong active angularlock detection (it was only burning cpu), stop trying to add a amotor to each child part and fix a typo. 2015-10-17 20:07:52 +01:00
UbitUmarov
8dcb4de53c fix GetTerrainHeightAtXY for large regions. Also change ode dispose() 2015-10-17 14:42:04 +01:00
Diva Canto
e14e432b50 More exception catching in ODE at shutdown. Not sure why the exception happens. 2015-10-14 17:57:13 -07:00
Diva Canto
45b8e6c1a7 Fixed exception upon shutting down in plain ODE.
09:49:57 - [SHUTDOWN]: Ignoring failure during shutdown - System.NullReferenceException: Object reference not set to an instance of an object.
   at OpenSim.Region.PhysicsModule.ODE.OdeScene.Dispose() in f:\dev\opensim-core\OpenSim\Region\PhysicsModules\Ode\OdeScene.cs:line 4062
2015-10-14 09:56:23 -07:00
UbitUmarov
aa3303e3af add get method on physics actors PIDHoverActive 2015-09-30 20:13:31 +01:00
UbitUmarov
9e183cbd30 fix for future non square regions 2015-09-23 03:31:23 +01:00
UbitUmarov
5f5dbfc264 same for old Ode 2015-09-23 01:50:59 +01:00
UbitUmarov
61ad58310b fix the typos that seem to matter so much to some :p 2015-09-12 02:21:27 +01:00
UbitUmarov
47aa8107fd let old ode also have a Module class 2015-09-09 18:53:24 +01:00
UbitUmarov
40fd7cbf74 a mess with Modules and Module 2015-09-08 20:03:54 +01:00
UbitUmarov
ecc1969857 more on compile.. 2015-09-08 18:13:15 +01:00
UbitUmarov
5b3e2ab9aa Merge branch 'mbworknew1' into ubitworkvarnew 2015-09-08 15:03:22 +01:00
Robert Adams
4dd17c4117 More 'everything is a module' merging.
Have most of UbitOde converted.
There are compile errors in OpenSimBase as the new modules stuff is not all there.
Removed ChOdePlugin as it's connection to OdePlugin was tangled.
2015-09-08 06:15:46 -07:00
Robert Adams
e5367d822b Merge of ubitworkvarnew with opensim/master as of 20150905.
This integrates the OpenSim refactoring to make physics, etc into modules.
AVN physics hasn't been moved to new location.
Does not compile yet.

Merge branch 'osmaster' into mbworknew1
2015-09-08 04:54:16 -07:00
Diva Canto
45046858a1 Typos in comments 2015-09-06 14:57:18 -07:00
Diva Canto
c2346a0823 Changed a couple of comments to be more generic 2015-09-05 10:28:44 -07:00
UbitUmarov
13b1c5dfce let ode suport var size regions
Signed-off-by: Diva Canto <diva@metaverseink.com>
2015-09-05 10:17:30 -07:00
Diva Canto
9435405ca1 Deleted physics plugin classes.
More unit tests fixed.
2015-08-31 16:23:43 -07:00
Diva Canto
50e7e38f45 Physics refactoring: all unit tests pass. 2015-08-31 15:04:10 -07:00
Diva Canto
11194209df First commit where physics work as region module.
Moved all physics dlls out of Physics and into bin directly, so they can be found by the module loader.
Removed call to PhysicsPluginManager.
2015-08-31 14:09:15 -07:00
Diva Canto
134d4300f0 All physics plugins are now region modules. Compiles but doesn't run. 2015-08-31 13:02:51 -07:00
Diva Canto
3741edd1c7 Refactored Meshing modules:
- Moved ZeroMesher from OpenSim.Region.PhysicsModules.SharedBase to OpenSim.Region.PhysicsModules.Meshing
- Created subfolder for all Meshmerizer files, also in the same Meshing dll
- Made them both region modules, with ZeroMesher being the default one
This compiles but doesn't run yet.
2015-08-31 09:21:05 -07:00
Diva Canto
ce2c67876e More namespace and dll name changes. Still no functional changes. 2015-08-30 21:05:36 -07:00
Diva Canto
2c0cad6dd3 Renamed the namespaces too 2015-08-30 20:29:31 -07:00
Diva Canto
1d6b33bc2d Major renaming of Physics dlls / folders. No functional changes, just renames. 2015-08-30 20:06:53 -07:00