2ab9588c9a
UbitODE: reduced the diference btw dinamic and static friction, making dinamic larger more identical to static.
2012-05-05 11:03:38 +01:00
3b78e33d16
ubitODE prims: - moved outbounds checking back to UpdatePositionAndVelocity() from move() so it's done at end of each ode step and when it reports positions to core. There should be no need to check in both places. - Addforce() and AddAngularForce now apply a force if parameter pushforce is true or apply a impulse if false as it's actually needed (the prims grab case should be a force)
2012-05-05 10:40:03 +01:00
b62cc3ce0a
Merge branch 'avination' into careminster
2012-05-05 10:32:22 +01:00
163a86517a
force lower avatar density for testing
2012-05-05 03:28:35 +01:00
6b3135aa4d
UbitODE: leave avatar 'freemove' state (entered on setmomentum) on any significant change like new 'velocity' or new position, etc, requests
2012-05-04 22:24:04 +01:00
8b1cc0dd29
Merge branch 'avination'
2012-05-03 00:15:45 +02:00
a135e51d23
Improved sitted avatars crossings ( plus tests on vehicles)
2012-05-02 22:08:09 +01:00
58d460542d
Merge branch 'avination'
2012-05-02 00:33:56 +02:00
303739622c
ubitODE fix applyROtationImpulse, let vehicle hover be relative to root prim and not center of mass ( as SL docs said) updated some flags to current ones
2012-04-29 11:46:16 +01:00
be176b1e49
ubitode fix inertia for same cases. Added a nasty lock on llGetCenterOfMass and simulate
2012-04-29 08:24:41 +01:00
174fa4a70f
Merge branch 'avination'
2012-04-29 01:33:40 +02:00
dd745f60c2
fix llGetCenterOfMass ( checked with ubitODE only)
2012-04-28 21:36:38 +01:00
e48fa38ff5
Oooops don't hover underground but do hover
2012-04-27 23:18:54 +01:00
f5cb403e7e
reorder priority of vehicle hover flags
2012-04-27 22:59:57 +01:00
ee237fc5df
test
2012-04-27 12:19:22 +01:00
8ef7df5a56
test
2012-04-27 11:01:34 +01:00
fedc9eb105
itest
2012-04-27 09:50:53 +01:00
1c735facee
test
2012-04-27 09:23:20 +01:00
7a7f4b7722
testing
2012-04-27 09:00:30 +01:00
03450dee39
testing....
2012-04-27 08:11:18 +01:00
6edbbdc83a
ubitODE fix don't report colisions with a volume detector ( only report to it )
2012-04-27 06:00:50 +01:00
e974d493c6
testing
2012-04-27 03:44:15 +01:00
d8f691664a
testing
2012-04-27 03:36:49 +01:00
76d9040ed4
testing
2012-04-27 02:54:39 +01:00
911bc81b00
testing
2012-04-27 02:13:54 +01:00
a64a9e48de
TESTING
2012-04-27 01:43:27 +01:00
db31c9fe58
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-04-25 19:15:40 +01:00
3da613adf5
fix chODE loosing some part positions when doing isPhysical false
2012-04-24 23:13:57 +01:00
c5520dc83f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-04-24 21:30:12 +01:00
c6f30e044b
Restore _parent_scene.actor_name_map[prim_geom] = this; accidentally removed from ODEPrim.SetGeom.
...
This occurred in 7a574be3fdhttp://opensimulator.org/mantis/view.php?id=5988
2012-04-24 20:15:10 +01:00
a4b76a42cc
let objects/avas push avas
2012-04-24 06:56:34 +01:00
159b3b27ca
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-04-23 21:13:08 +01:00
e903709847
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2012-04-23 20:44:41 +01:00
5a8fdc8a0b
ubitODE - do own timing control (as chODE does) until heartbeat does it right
2012-04-23 20:16:53 +01:00
e0f81e2400
ubitODE - several changes...
2012-04-23 01:47:11 +01:00
49ed68e98c
refactor: simply some properties code in BasicPhysicsPlugin
2012-04-22 20:28:12 +01:00
8205fe79ce
Fix bug where setting phantom on a prim would result in a server log message rather than setting phantom.
...
This was an oversight when removing some race conditions from PhysicsActor setting recently.
Regression tests extended to probe this code path.
Extending regression tests required implementation of a BasicPhysicsPrim (there was none before). However, BasicPhysics plugin is still of no current practical use other than to fill in as a component for other parts of regression testing.
2012-04-22 19:51:51 +01:00
8df4bd14f5
Merge branch 'master' into careminster
2012-04-22 15:06:06 +01:00
190e7a4334
ubitODE: - don't try to hover underground unless volumedetector (that doesn't colide with it)
2012-04-21 05:16:54 +01:00
ae2b8f7007
Comment out spurious Body != IntPtr.Zero code after disableBody(), since disableBody() sets Body == IntPtr.Zero on all code paths.
2012-04-21 03:42:54 +01:00
f609594595
refactor: Simplify ODEPrim.AddChildPrim() by returning early where appropriate.
2012-04-21 03:23:51 +01:00
7a574be3fd
Remove redundant prim_geom != IntPtr.Zero checks in ODEPrim.
...
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.
2012-04-21 00:12:07 +01:00
566327a948
If a physical prim is manually moved (e.g. by a user) then set the geometry 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
2012-04-20 23:24:24 +01:00
31c5a7241e
Merge branch 'master' into careminster
2012-04-20 23:17:29 +01:00
2c7f035925
ubitODE: - Change triangles used in terrain height estimation
2012-04-20 04:49:23 +01:00
ec6347f987
ubitODE - again avatar/terrain collision. Reduce new viewers interpolators efects reporting null velocity and aceleration when stopped near the right position, where they can still have instantanius large values that can get magnified by interpolators, specially using diferent timing estimation.
2012-04-20 03:17:36 +01:00
9b02e1cf4a
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-04-19 01:52:23 +01:00
08714a0d38
ubitODE still retouching character pid
2012-04-18 03:59:38 +01:00
7f42069295
ubitODE - retouch character PIDs
2012-04-18 03:02:28 +01:00
9464fcebcd
ubitODE: prims - update managed dinamic parameters from unmanaged at ODE rate and not heartbeat.
2012-04-17 16:49:08 +01:00
9132c9e499
ubitODE: - character managed ode was only getting position etc from unmanaged at heartbeat rate like core ode. Now do it at ODE rate in move(..). UpdatePositionAndVelocity() called once per heartbeat is now empty.
2012-04-17 15:50:14 +01:00
d7e2454281
ubitODE: - made avatar/ground collision pid servo a bit softer since seems a bit unstable with small avas in AVI even if fine on my testsite - Removed reading of PID parameters from config files since that only serves to mess things up and adds more unknowns
2012-04-17 14:24:13 +01:00
36207b88ff
ubitODE: bug fix let avatars colide with volume detectors
2012-04-17 01:00:50 +01:00
d30b18b1de
Merge branch 'ubitwork'
2012-04-17 00:09:04 +02:00
6480b72eda
ubitODE: - fix remove characters from default raycasts filters as older code (or camera is very odd) - Slow down avatar if velocity is higher than 50m/s as in chODE
2012-04-16 19:44:02 +01:00
adb629a416
Merge branch 'ubitwork'
2012-04-16 20:02:15 +02:00
fff5c61ae8
chODE: if character velocity > 50m/s apply breaks. In free fall this will give a terminal velocity +- 60m/s
2012-04-16 17:47:17 +01:00
04ed5519a5
chODE bug fix
2012-04-16 17:14:31 +01:00
03139f07d7
Downgrade an error log message to info because there is nothing we can do if
...
an asset is damaged so it should not spew red ink.
2012-04-16 17:32:30 +02:00
86a2169d73
ubitODE + physmanager: - Revised use of ODE collisions categories and bits(flags) for better use as filters together with top spaces (for example physical prims are on topactivespace and not physical are on topstaticspace) - Added new world raycast with filters. This blocks calling thread with a timeout of 500ms waiting for heartbeat ode thread signal job done. - Don't let ode bodies being disabled for 2 long except for vehicles. This is necessary to detect when the object is at rest at top of other and that is removed. Assume that vehicles can be enabled by used action.
2012-04-16 16:16:55 +01:00
3999822e13
Use chode character actor.SetMomentum() to force full restore Velocity in scenepresence TeleportWithMomentum(), since actor.Velocity was selected by original coders as the input of a desired velocity (even 'forces') that is modified by character conditions, like not changing velocity.Z if it is in free fall.
2012-04-14 05:07:52 +01:00
39079a62c0
chODE and ubitODE always return prim mass (they where returning object mass on physical prims) so SOG can do the total add. (ubitODE as more code to use a simpler terrain geom on a modified ode lib but should do autodetect and work with normal lib).
2012-04-09 20:58:40 +01:00
c4e4e04eee
reduced instability in vertical atractor with eficiency of 1 and banking
...
this will need a nicer solution sometime...
2012-03-31 00:03:45 +01:00
de45fe7515
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-27 21:58:25 +01:00
6b5f3b49e7
Merge branch 'master' into careminster
2012-03-27 18:11:05 +01:00
872d513daa
BulletSim: make avatar animations update properly.
...
It seems that ODE calls the avatar collision handling routine even
if there are no collisions. This causes the animation to be updated.
So, for instance, going from HOVER to FLY is caused by the physics engine
calling the collision routine each frame with 0 collisions.
2012-03-26 17:36:33 -07:00
caeaa03a69
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-26 23:04:07 +01:00
0bd0514e81
Merge branch 'master' into careminster
2012-03-26 16:47:02 +01:00
2fcdecf090
BulletSim: fix typo introducted by previous checkins (git merge sometimes makes mistakes)
2012-03-26 08:57:40 -07:00
88d5cb6eef
UbitOde let caller try to build meshs like done in chode. Changing this was a bad move i made. Variable colisions softness.
2012-03-24 16:04:13 +00:00
21a97408d4
Avatars have no bounce
2012-03-24 11:30:29 +00:00
07388071d4
Merge branch 'bulletsim1' of ssh://island.sciencesim.com/home/sceneapi/radams1/bs-opensim into bulletsim1
...
Conflicts:
OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
2012-03-23 16:20:53 -07:00
ff54b3c366
BulletSim: change default of shouldDisableContactPoolDynamicAllocation from False to True. It seems that collisions don't happen well when it is False (things fall through terrain).
2012-03-23 15:50:32 -07:00
3f53b7bc91
BulletSim: Add new configuration parameters to get and set console commands
2012-03-23 13:15:24 -07:00
142de1d02f
BulletSim: add a bunch of internal Bullet configuration parameters to OpenSimDefaults.ini and the code.
2012-03-23 13:15:23 -07:00
1273f259e4
BulletSim: remove confusion between angularVelocity and rotationalVelocity (there is still confusion in the rest of OpenSim). Enhance some debug statements to include the object ID.
2012-03-23 13:15:22 -07:00
1a738caeca
BulletSim: update TODO list. Rearrange code for readability. Add per object friction and restitution runtime settable parameters.
2012-03-23 13:15:18 -07:00
de24feb275
BulletSim: Add AvatarRestitution parameter. Centralize computation of buoyancy for flying. Tweek avatar default friction and resititution
2012-03-23 13:15:17 -07:00
6ecdadb329
BulletSim: set buoyancy in only one place
2012-03-23 13:15:16 -07:00
b22d040169
BulletSim: add some new runtime setable parameters to match the dll.
2012-03-23 13:15:14 -07:00
975184b3f9
BulletSim: Update list of TODO tasks
2012-03-23 13:15:11 -07:00
efe61b2481
BulletSim: remove confusion between angularVelocity and rotationalVelocity (there is still confusion in the rest of OpenSim). Enhance some debug statements to include the object ID.
2012-03-22 17:04:06 -07:00
7783c93802
BulletSim: update TODO list. Rearrange code for readability. Add per object friction and restitution runtime settable parameters.
2012-03-21 16:16:47 -07:00
cb2727cf6e
BulletSim: Add AvatarRestitution parameter. Centralize computation of buoyancy for flying. Tweek avatar default friction and resititution
2012-03-21 16:16:46 -07:00
6c55fd93a3
BulletSim: set buoyancy in only one place
2012-03-21 16:16:45 -07:00
898a16802b
BulletSim: add some new runtime setable parameters to match the dll.
2012-03-21 16:16:44 -07:00
eafc3d6c47
BulletSim: Update list of TODO tasks
2012-03-21 16:16:41 -07:00
4f593fa8c3
minor clean
2012-03-21 21:17:00 +00:00
a03c55fee7
missed a creatMesh in chODE. temporary removed m_meshfailed test since it may colide with how meshs and sculpts are loaded. This needs a good revision..
2012-03-21 14:03:50 +00:00
316f272b62
shapetype support on chOde so it can also request a simple convex hull 'mesh'
2012-03-21 12:57:46 +00:00
f6cbafcaf0
Changes of PrimShapeType should now work with UbitOde ( almost untested )
2012-03-21 02:39:16 +00:00
11ed932263
Tell physics about physics shape when creating. Added some virtual methods to get/set density,gravmod, frition,bounce and shape type ( not in use ). UbitOde now should do convex type on creation or everytime the mesh is changed ( as in change size, shape, etc )
2012-03-21 01:46:41 +00:00
2e41294da9
add convex state to mesh key, so a change is detected.
2012-03-21 01:24:30 +00:00
4c41b53a4b
Add prim name to "[MESH]: No recognized physics mesh..." log message
2012-03-20 23:35:50 +00:00
3d258d2688
Merge branch 'ubitwork'
2012-03-20 23:09:34 +01:00
8817b6e74c
let convex be a parameter to createMesh so it can be used. Was forced to add it also to original mesher code and zeromesher
2012-03-21 00:02:41 +00:00
35c3124c3b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-03-20 23:39:02 +00:00
23e6a31aa5
added convex decomposition hulls support. Hardcoded to use mesh or this. (so no simple hull of convex prims for now).
2012-03-20 23:38:04 +00:00
fdd4d787a4
Merge branch 'master' into careminster
2012-03-20 20:48:55 +00:00
86bd287b53
refactor: precalculate the fixed movement factor for avatar tilting (sqrt(2)) rather than doing it multiple times on every move.
2012-03-20 20:39:33 +00:00
5f2a65c976
refactor: Eliminate unnecessary duplicate avCapsuleTilted
2012-03-20 20:28:58 +00:00
8c1550b58e
WORK in progress!! Now it reads the simple hull shape to use if convex shape is selected for a prim. Due to ODE limitations on convex hulls colisions, it creates a mesh. Being work in progress it is hardcoded to only read that simple convex hull for now. It writes a file named "lixo_lixo.raw" that can be imported into blender for examination of the created mesh (the last one loaded and also hardcoded). To play with put in opensim.ini "meshing = UbitMeshmerizer"
2012-03-20 19:24:45 +00:00
5768a151ff
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLXAssetData.cs
2012-03-20 02:48:11 +00:00
1c0f3a1f21
Fix crash where two scene loop threads could changes m_MeshToTriMeshMap at 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.
2012-03-20 00:40:03 +00:00
41a0c850f8
added a new UbitMeshing module so i can mess it...
2012-03-17 09:27:56 +00:00
b5e172677d
ubitode prim select was not doing phantom case
2012-03-12 07:46:20 +00:00
2a17dafa04
missing file in ubitODE
2012-03-12 06:52:03 +00:00
925295f3ab
ubitOde also knows a bit more about physical phantom
2012-03-11 12:33:59 +00:00
43dc0ee020
more phantom physics ( chODE and a fix in manager physicsactor
2012-03-11 07:44:34 +00:00
21a76a619f
initial steps to support physical phantoms
2012-03-11 06:32:06 +00:00
0e5e324a2c
ubitOde bug
2012-03-09 17:20:49 +00:00
13f340077c
let chode and ubitode find ode.dll on windows
2012-03-09 04:19:39 +00:00
f3e04beb2e
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-03-07 00:51:24 +00:00
7377e633c7
update ubitOde
2012-03-05 12:37:21 +00:00
182f5efbe9
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-03-04 16:23:46 +00:00
01fcd400d7
update UbitOde
2012-03-04 04:26:05 +00:00
7c931037bd
update UbitODE
2012-03-04 01:40:12 +00:00
fc781f0894
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-03 17:08:01 +00:00
bfcba0a417
This still causes terrain artefacts
...
Revert " fix my bug on ChODE terrain heightmap build"
This reverts commit aa77d1d486
2012-03-02 22:20:02 +01:00
458f295fdb
This still causes terrain artefacts
...
Revert " fix the last fix. Regions are square but... Also remove the 0.5 offset in map position. It was apparently needed to fix we having nsamples = size and not size + 1."
This reverts commit 15bc539bd4
2012-03-02 22:19:28 +01:00
f42fd7fb77
update ubitODE
2012-03-02 15:05:30 +00:00
ee4d3bfad2
ubitODE bug fix
2012-02-29 19:36:16 +00:00
a8f1cd7e86
update ubitODE to current working state
2012-02-29 19:32:23 +00:00
a0d75be56b
fix
2012-02-29 05:14:29 +00:00
5534cf8b57
chODE: bad meshs get a a basic box or sphere geom with setted prim size. They will not colide if non-physical and Will collide with land if physical. assume UNTESTED
2012-02-29 05:03:26 +00:00
a8a7bb549d
made box a little larger
2012-02-28 20:24:03 +00:00
1c7700db88
A few blind changes to go try to go around bad mesh little box replacement fail
2012-02-28 20:14:26 +00:00
9bad3b846f
Really dirty hack to make sims start. Causes errors but the ting runs. Remove
...
when fixed right.
2012-02-28 10:37:46 +01:00
a725b5e01e
Let inworld meshs colide as such and not as basic prim all the time. Removed also LOD, and outerskin on colision meshs.
2012-02-27 20:08:43 +00:00
0d51c42f59
update ubitODE to my current working state
2012-02-27 02:10:03 +00:00
118986f150
added in chODE GeomTriMeshDataDestroy to explicity release internal trimesh data.
2012-02-26 17:51:43 +00:00
23679c3808
replace bad meshs by a small cube and log it.
2012-02-24 20:34:11 +00:00
ec94b82f51
stop using useless geom tricallback.
2012-02-24 18:25:43 +00:00
37068d17c5
Merge branch 'master' into careminster
2012-02-24 09:56:06 +00:00
f67f37074f
Stop spurious scene loop startup timeout alarms for scenes with many prims.
...
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.
2012-02-24 05:02:33 +00:00
15bc539bd4
fix the last fix. Regions are square but... Also remove the 0.5 offset in map position. It was apparently needed to fix we having nsamples = size and not size + 1.
2012-02-23 00:50:07 +00:00
aa77d1d486
fix my bug on ChODE terrain heightmap build
2012-02-23 00:22:44 +00:00
cb4509f3b8
Reverse the changed to ODE heightmap. It results in SERIOUS issues like an
...
irreversible y-flip and holes in the map.
2012-02-21 21:34:02 +01:00
03e7bc1526
Merge branch 'master' into careminster
...
Conflicts:
2012-02-21 10:20:56 +00:00
daee2eda93
Load 32-bit or 64-bit BulletSim Windows library automatically as appropriate.
...
This uses the same approach as ODE.
radams, if this doesn't work for you please feel free to revert.
2012-02-21 04:10:39 +00:00
68a4ef5ef6
Add 64 bit Windows sqlite3.dll and use this if running a 64-bit windows process.
2012-02-21 02:52:20 +00:00
19d271d3fc
Remove PhysXPlugin and wrappers.
...
In over 4 years this never progressed beyond an unimplemented stub.
This doesn't mean that it can't come back if someone is interested in implementing PhysX support.
2012-02-21 01:45:17 +00:00
96409cc2ee
Merge branch 'ubitwork'
...
Conflicts:
OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
2012-02-19 20:08:01 +01:00
185bf55804
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-02-19 14:20:53 +01:00
736fb0b41d
minor fix to chODE terrain heighmap scale
2012-02-19 02:07:43 +00:00
985526b662
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
2012-02-18 22:21:10 +00:00
3aee642190
changed how vehicle data is stored and passed to physics. use unsafe in serializer, tried to control m_dupeInProgress
2012-02-18 17:42:14 +00:00
9846a1e56e
Report an error if the required native Windows ODE library can't be found.
2012-02-18 02:52:29 +00:00
b817c337dc
On Windows automatically load the correct native ODE library depending on whether the process is 32-bit or 64-bit
...
In theory, this means that a 64-bit Windows OS user can now run OpenSim.exe with ODE and use more than 2 (or 3) GB of memory.
However, this is completely untested since I don't currently own a 64-bit Windows box. Feedback appreciated.
Using OpenSim.32BitLaunch.exe should continue to work. Other platforms are unaffected.
This will currently not work with sqlite - I will add that too if this works.
2012-02-18 00:33:52 +00:00
7d77ccc659
Added simple binary serializer/deserializer to chODE. 100% untested and most like still broken
2012-02-17 21:09:00 +00:00
c0760f9f91
Comment out "experimental" log message printed out whenever a physics mesh was generated for a mesh
...
Also adds prim name to the "no asset data" error log message
2012-02-16 00:28:57 +00:00
819fcdaee1
Now if chode prim.cs detects out of bounds it requests a update and blocks movement and colisions. Base code must do a PhysActor.CrossingFailure() to make it move again inside sim or delete it.
2012-02-15 22:04:26 +01:00
3bffdddc9d
don't freeze with a sitted avatar in a border without other sim. Still messy :(
2012-02-15 22:04:17 +01:00
f6c35cf26f
Now if chode prim.cs detects out of bounds it requests a update and blocks movement and colisions. Base code must do a PhysActor.CrossingFailure() to make it move again inside sim or delete it.
2012-02-15 20:33:31 +00:00
b59275355e
don't freeze with a sitted avatar in a border without other sim. Still messy :(
2012-02-15 19:44:54 +00:00
a758abaa9f
try to make crossings work better. chode no longer prevents crossings i hope
2012-02-15 17:08:33 +00:00
f6f0d884bd
try to make crossings work better. chode no longer prevents crossings i hope
2012-02-15 16:44:15 +01:00
04279e36d1
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-02-15 03:51:30 +00:00
272ba5a741
Merge branch 'master' into careminster
2012-02-15 01:11:17 +00:00
6fd6919a0b
remove drawstuff from ubitode
2012-02-11 19:25:41 +00:00
f168fefb79
removed outdated coments.
2012-02-11 19:14:27 +00:00
bcf59a574f
remove forgotten taints code
2012-02-11 19:12:04 +00:00
022ae33ed5
UbitODE: replace 'taints' by 'changes' for avatars also. This provides better time order with changes in prims.
2012-02-11 17:35:38 +00:00
d4e28ed113
vehicle changes done by simulation thread and not calling one
2012-02-11 15:18:13 +00:00
3f9c390b4d
changes to vehicle banking
2012-02-11 14:29:36 +00:00
33a9f0f1c5
a bit better vertical attractor and banking
2012-02-11 04:42:45 +00:00
f415256e0b
Use mesh to estimate real center of prims if avaiable. Let sculpt map textures with alpha channel work. On linux J2DecodeCache folder must be deleted to remove bad entries. Corrently this can't be cached on linux (mono/ cairo/? problem)
2012-02-11 03:25:17 +00:00
b617411b97
scale avatar push force with avatar density
2012-02-11 02:48:38 +00:00
b92b9228ef
correct the default avatar_terminal_velocity value that I accidentally left in whilst testing
2012-02-11 02:29:07 +00:00
f49897a419
Clamp ODE character velocity. Make ODE falling character 54m/s by default.
...
If velocity reaches 256 in any vector then bad things happen with ODE, so we now clamp this value.
In addition, a falling avatar is clamped by default at 54 m/s, which is the same as a falling skydiver.
This also appears to be the value used on the linden lab grid.
This should resolve http://opensimulator.org/mantis/view.php?id=5882
2012-02-11 02:28:40 +00:00
43a74d8481
test on git
2012-02-10 23:51:55 +00:00
7cf73cb92a
Changes to vehicles code etc. Includes some debug aids to remove later.
2012-02-10 22:43:51 +00:00
6af01f6767
initial introdution of physics actor building control.
2012-02-08 23:14:53 +00:00
c75fa8b8a1
changes in physics manager, needed for UbitODE
2012-02-08 15:28:13 +00:00
815f3af1d7
UbitODE plugin initial commit
2012-02-08 15:24:10 +00:00
4ce42762ee
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-01-26 00:21:21 +00:00
e9de7e7107
Update BulletSim.dll with some interface changes and tuning (see opensim-libs). Change BSScene to use new interface.
2012-01-25 14:40:38 -08:00
e20cf3789b
Serialize calls to ODE Collide() function across OdeScene instances to prevent ODE crashes on simulators running more than one region.
...
It turns out that calls to Collide() are not thread-safe even for objects in different ODE physics worlds due to ODE static caches.
For simulators running multiple regions, not serializing calls from different scene loops will sooner or later cause OpenSim to crash with a native stack trace referencing OBBCollider.
This affects the default OPCODE collider but not GIMPACT. However, GIMPACT fails for other reasons under some current simulator loads.
ODE provides a thread local storage option, but as of ODE r1755 (and r1840) DLLs compiled with this crash OpenSim immediately.
2012-01-25 19:31:50 +00:00
427ab55058
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
2012-01-25 00:45:57 +00:00
8b035dc3c7
Restrict accessible of ODECharacter Shell and Body. Add method doc and some error log lines.
2012-01-24 18:46:24 +00:00
a6e305063e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
OpenSim/Services/Interfaces/IUserAccountService.cs
2012-01-02 21:41:36 +00:00
014a86c26b
Adding commented out log messages and some minor formatting for future bug hunting. No functional changes.
2012-01-02 19:46:30 +00:00
c9dbcfbb31
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2011-12-24 01:43:44 +01:00
f2855d3668
Add setter for Acceleration on physics objects.
2011-12-24 01:41:32 +01:00
b8a914b15b
Merge branch 'master' into careminster
2011-12-23 01:00:34 +00:00
790ca65c84
Align default ODE_STEPSIZE with that already used through OpenSimDefaults.ini
2011-12-22 20:22:15 +00:00
b970d4f976
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-12-22 16:37:25 +00:00
41b02a7208
Remove unused SetAcceleration and add set on Acceleration parameter
2011-12-20 14:45:32 -08:00
ca6113a4d5
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
2011-12-20 21:51:43 +00:00
dd69c9fd20
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-20 09:53:05 -08:00
25cbba9bca
Fixed bug of avie going under the terrain when crossing regions in certain directions. This was a 1-off bug: the terrain was being placed in 127, 127 resulting in a bounding box if -2, 256. I placed it in 128, 128 resulting in a bounding box of -1, 257.
2011-12-20 09:43:39 -08:00
759f1d2dbe
Merge branch 'master' into careminster
2011-12-18 10:49:45 +00:00
5d79f857b0
Comment out accidentally left in "Adding physics prim" log message
2011-12-16 20:54:28 +00:00
8013c0d2f5
Stop pointlessly setting the m_colliderarr[] to false in the ODECharacter constructor
2011-12-15 22:33:14 +00:00
c0ba99e5ad
Stop having to call SetHeight again in ScenePresence.AddToPhysicalScene() when we've already passed size information to the avatar at PhysicsScene.AddAvatar()
...
Eliminate some copypasta for height setting in OdeCharacter
2011-12-15 22:29:36 +00:00
937c06db54
Code cleanup related to ScenePresence.PhysicsActor and OdeScene/OdeCharacter
...
Stop hiding RemoveAvatar failure, add log messages when characters are removed through defects or re-added unexpectedly.
Add commented out log lines for future use.
Use automatic property for PhysicsActor for better code readability and simplicity
2011-12-15 21:57:22 +00:00
6f2d80cc93
minor: add some currently commented log lines for use in debugging
2011-12-14 21:27:47 +00:00
69f29cb53e
Merge branch 'master' into careminster
2011-12-14 19:50:43 +00:00
e830a77860
Simplify some manipulation of _taintedActors in OdeScene
2011-12-14 18:33:44 +00:00
a110a7bd6a
Eliminate _taintedPrimsH and _taintedPrimsL (and _taintedPrimLock) in favour of just a _taintedPrims HashSet.
...
There's no point maintaining a list because any pending taint operations are all carried out in the same call anyway.
2011-12-14 18:03:25 +00:00
898549d13e
Merge branch 'master' into careminster
2011-12-14 08:57:55 +00:00
4dfd2c7d47
minor: remove pointless comment from OdeScene.cs
2011-12-12 19:31:50 +00:00
b60ff651a3
Merge branch 'master' into bigmerge
2011-12-01 12:16:59 +00:00
a17f93ff44
minor: remove mono compile warning, a Vector3 can never be null since it's a struct
2011-11-29 16:31:10 +00:00
dc612d0f08
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2011-11-28 11:06:38 +00:00
b785f204ce
remove some mono compiler warnings
2011-11-25 22:19:57 +00:00
a8270cb48c
Merge branch 'master' into bigmerge
2011-11-24 01:16:37 +00:00
b56410285b
Log error if we attempt to add/remove an OdeCharacter from the _characters list inappropriately
2011-11-22 22:46:25 +00:00
ace4324e75
Stop removing actor from the hash maps in OdeScene.RemoveCharacter() since this is now being down in OdeCharacter.DestroyOdeStructures()
2011-11-22 22:37:06 +00:00
af90b52731
Comment out uncalled OdeScene.UnCombine()
2011-11-22 22:28:46 +00:00
daf99f8c0a
slightly simplify OdeScene.Simulate() by removing bool processtaints, since we can inspect count of taint lists instead.
...
also groups OdeCharacter.CreateOdeStructures() and DestroyOdeStructures() together
2011-11-22 21:51:00 +00:00
c4e4a29478
Slightly improve "Unable to space collide" logging message, though I don't think I've ever seen this.
2011-11-21 21:31:26 +00:00
4ddff7eb0f
Get rid of OdeCharacter != null checks since OdeScene._characters can never contain a null character.
...
Ignoring the ancient code glyphs not to do this....
2011-11-21 21:29:56 +00:00
82dc7886fc
remove unnecessary OdeScene._activeprims locking. Code is single-threaded
2011-11-21 21:15:15 +00:00
7480f2fd0e
Restore defects list. In hindsight, the reason for this is becuase we can't remove the character whilst iterating over the list.
...
This commit also removes locking on OdeScene._characters since code is single threaded
2011-11-21 21:04:24 +00:00
546259b2ff
simplify operation of OdeScene._perloopContact
2011-11-21 20:30:37 +00:00
25d9001de1
don't bother locking OdeScene._perloopContact in single threaded code
2011-11-21 20:17:36 +00:00
e33b0fa35b
don't lock OdeScene.contacts since only ever accessed by a single thread
2011-11-21 20:12:04 +00:00
e67ba0ad06
rename ODECharacter.AvatarGeomAndBodyCreation() -> CreateOdeStructures() to match existing DestroyOdeStructures()
2011-11-21 20:01:34 +00:00
063f0f5d97
refactor: Eliminate one line ODECharacter.doForce() method for code clarity
2011-11-21 19:58:37 +00:00
225b925f4e
Comment out calls to OdeScene.waitForSpaceUnlock() since that method does nothing right now
2011-11-21 19:48:31 +00:00
54789706f4
Reduce complexity of OdeScene.Simulate() by fully removing bad characters at point of detection rather than later on.
2011-11-21 19:45:22 +00:00
3becda919e
move geom/actor map maintenance into DestroyODEStructures()/AvatarGeomAndBodyCreation().
...
This saves us having to do it separately when a character capsule size is changed
2011-11-21 19:31:29 +00:00
4faac1f090
When changing avatar size in ODE, remove the old actor from the name and actor maps
2011-11-21 19:06:53 +00:00
898904d83d
When an ODECharacter is removed (e.g. when an avatar leaves a scene), remove the actor reference in OdeScene.actor_name_map rather than leaving it dangling.
...
This also largely centralizes adds/removes in OdeScene.AddCharacter()/RemoveCharacter()
2011-11-21 18:27:41 +00:00
cead87005b
Have ODECharacter and ODEPrim both use PhysicsActor.Name instead of maintaining their own properties
2011-11-21 18:06:04 +00:00
4fdcfd79e4
Actually remove PhysicsActor.SOPDescription this time
2011-11-21 17:55:54 +00:00
4485007fce
Instead of generating a new list for bad characters on every physics pass, keep reusing the same list.
2011-11-21 17:04:54 +00:00
31736b1aac
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
2011-11-17 19:04:27 +00:00
b6d83e9c0f
Stop OdePrim and OdeCharacter insanely overriding set LocalID to set their 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
2011-11-16 23:01:59 +00:00
e16d7fe1da
Instead of having scene add/remove collision events directly to the OdeScene collision event dictionary, marshall them via a change dictionary first.
...
This is to avoid a complicated tri-thread deadlock on region crossing for avatars with attachments, where
1) XEngine starting up scripts can lock XEngine.m_Scripts and then try to lock OdeScene._collisionEventPrim while starting up a script due to avatar border crossing
2) An existing collision event will lock OdeScene._collisionEventPrim and then try to lock SP.m_attachments while trying to send the collision event to attachments
3) The avatar still entering the region will lock SP.m_attachments and then try to lock m_Scripts to start more attachment scripts.
2011-11-15 20:02:09 +00:00
45c7789b54
use a more efficient dictionary in OdeScene._collisionEventPrim rather than a list
2011-11-15 19:42:33 +00:00
2cf6172689
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-11-05 11:05:32 +00:00
f7b8c54c24
Add comment for experimental effect of removing the Thread.Sleep(20) in ODEPrim.changevelocity()
2011-11-04 23:43:17 +00:00
b9f7aebde3
Merge branch 'master' into bigmerge
2011-11-04 23:21:19 +00:00
ccca6ba935
Stop llPushObject() from causing problems by adding force via a taint rather than directly.
...
This isn't a perfect solution since there can be a race between the taint processing and taint setting, as force needs to be reset after processing.
Needs careful locking in the future.
2011-11-04 23:12:01 +00:00
083b28de8c
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2011-10-30 10:16:25 +00:00
9fdd1753fa
Add taint target velocity for ODECharacters as is already done for ODECharacter position and position and velocity for ODEPrims.
...
This is to help stop surprises if the velocity is set in the middle of physics calculations, though this probably isn't a huge problem.
It's more for consistency and for the next step of removing some scene locks
2011-10-29 02:30:33 +01:00
ef8370fb8e
tidy up OdeCharacter so that we just use OpenMetaverse.Vector3 assignment directly where possible, instead of transferring X, Y and Z components separately
...
some of this is probably a hold over from using ODE.Vector3, which is still necessary in some places.
2011-10-29 02:07:28 +01:00
a5ea9f8830
Move position set from taint to logically better position at top of ODECharacter.ProcessTaints() though this makes no practical difference
2011-10-29 01:46:22 +01:00
5ae8de3c00
Stop setting _position as well as m_taint_position in ODECharacter.Position
...
setting position at the same time as taint appears to undermine the whole purpose of taint
testing doesn't reveal any obvious regressions in doing this
2011-10-29 01:39:48 +01:00
b975cbcbed
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2011-10-27 18:14:38 +01:00
820242bc49
Fix a bug I introduced yesterday in ODE physics where prim scripts would only receive the very first collision.
2011-10-27 02:05:59 +01:00
6a96c9546d
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2011-10-26 17:48:51 +01:00
fd22159d0c
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Framework/Watchdog.cs
2011-10-26 01:27:24 +01:00
6a74a4c12b
Clear OdeCharacter CollisionEventUpdate when we subscribe or unsubscribe from collision events
2011-10-25 22:46:42 +01:00
0f83f87233
Remove unused fields from CollisionEventUpdate
2011-10-25 22:39:08 +01:00
c825c9a945
Get rid of the pointless null checks on collision listeners. Add warning about synchronicity for PhysicsActor.OnCollisionUpdate event doc
2011-10-25 22:35:00 +01:00
b9f106f484
When sending object collision updates, don't null out and recreate the CollisionEventUpdate() if the number of collisions falls to zero. Reuse the existing one instead.
2011-10-25 22:28:40 +01:00
5d37f0471e
For ScenePresence collision events, instead of creating a new CollisionEventsThisFrame every time we need to send some new ones, reuse the existing one instead.
...
This assumes that the listener is using the data synchronously, which is currently the case.
2011-10-25 22:19:17 +01:00
7b6b36cee9
Fix bug where collision event listeners were not removed once the listener had gone away.
...
This was causing continuous use of temporary memory even when all avatars had left the scene.
Memory does leak but it does cause more calls to the garbage collector, which would pause the scene thread for a very short while during collection.
2011-10-25 21:40:51 +01:00
1fbb379536
minor: rename a parameter in OdeScene.Simulate() from actor -> prim since it's an OdePrim
2011-10-25 21:15:37 +01:00
0531b73695
Merge commit '4241ee5dfab99d4e247624a2f368a8a931d2e54c' into bigmerge
2011-10-25 03:18:10 +01:00
564563d273
Merge commit '30fe66d3ab534422407415817b570a66096c543b' into bigmerge
2011-10-25 03:18:04 +01:00
6d4480c1ca
Merge commit '9c430208769ab7fd7877093e278e8fcae02ecef3' into bigmerge
2011-10-25 03:17:59 +01:00
e35835602f
Merge commit 'b63ec987b0a1692da4c5e84facf0ea149d4cfe90' into bigmerge
2011-10-25 03:17:40 +01:00
71b4486356
Merge commit '581885da75c57250201b34e2d585d32c8f07089a' into bigmerge
2011-10-25 02:55:46 +01:00
6a01246cc6
Merge commit '03202ada2918c0c0837e8de50e3a0436e4407c91' into bigmerge
2011-10-25 02:55:38 +01:00
10dff1da7f
Merge commit '1d4cd76e8a8c64da71fc384ff9c654d7f4f849c1' into bigmerge
2011-10-25 02:55:25 +01:00
2134f23da0
Merge commit 'f10a824e47549806c1fa647c4e9fba4c8cf6ad13' into bigmerge
2011-10-25 02:55:19 +01:00
43751d0cfd
Merge commit '5515c45e3b42497f64f8e5846697471b1de952c5' into bigmerge
2011-10-25 02:55:14 +01:00
7ac9463e35
Merge commit '71d221cdc090cdedf371ead534421bb7074908cd' into bigmerge
2011-10-25 02:55:01 +01:00
e2de57ca29
Merge commit '0c041ce12f393367e2754e88d9b8dad5e45f88c4' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-10-25 02:26:56 +01:00
077e3500b2
Merge commit '978fb3d482072d840e6280aa5acd090b67ee6205' into bigmerge
2011-10-25 01:52:42 +01:00
a09e72c8cc
Merge commit '9cc2694776e261868138c325a82ce5481c2908ec' into bigmerge
2011-10-25 01:52:26 +01:00
63cbdb9b2a
Merge commit 'f2132329a358db2c66c29501d35ef54eae8d6eed' into bigmerge
2011-10-25 01:52:19 +01:00
f4e4026a7a
Merge commit '4bfc2f5cdea4b739110cae3b37945d88ad527334' into bigmerge
2011-10-25 01:51:49 +01:00
24e260744a
Merge commit '77c65951e06c1d309f2bc8f6d2451b2b9a82c9df' into bigmerge
2011-10-25 01:51:06 +01:00
747786aac0
Merge commit '20da04fd0c909a00c0cdc2585f242e95c868801a' into bigmerge
2011-10-25 01:43:05 +01:00
d68b73bfba
Merge commit '227db07f2ff8a1ba840a0d3018bb242a34d6038f' into bigmerge
2011-10-25 01:42:56 +01:00
4241ee5dfa
very minor removal of old commented out line of code in OdeScene
2011-10-21 00:04:36 +01:00
30fe66d3ab
remove unnecessary null check on _collisionEventPrim
2011-10-20 20:58:29 +01:00
9c43020876
Get OdeScene to use passed in time step rather than hard-coded 0.089
...
However, I still don't recommend changing MinFrameTime from 0.089, high values do not work well and lower values don't seem to make much difference
2011-10-20 20:48:51 +01:00
b63ec987b0
For now, stop passing timeStep into methods where it's not actually used.
2011-10-20 17:54:32 +01:00
581885da75
Temporarily put in log lines to record time taken to set terrain in OdeScene.
2011-10-18 21:21:15 +01:00
03202ada29
Store scene identifier passed in to OdeScene for later debug messages
2011-10-18 21:11:13 +01:00
1d4cd76e8a
Don't bother taking OdeLock during OdeScene construction, since there can be no contention until the object is constructed.
2011-10-18 21:03:41 +01:00
f10a824e47
Remove unnecessary lock of OdeLock in OdePrim.changeadd()
...
This taint can only ever be processed from the OdeScene.Simulate() loop, which already locks OdeLock.
2011-10-18 20:58:59 +01:00
5515c45e3b
minor: method doc to explain a lock of OdeLock
2011-10-18 20:56:11 +01:00
71d221cdc0
Remove the unused CollisionLocker from ODE
...
Despite its name, this wasn't actually being used in any collision checking
2011-10-18 17:35:58 +01:00
0c041ce12f
Implement osNpcSit(). This is still in development so don't trust it
...
Format is osNpcSit(<npc-uuid>, <target-uuid>, OS_NPC_SIT_IMMEDIATE)
e.g. osNpcSit(npc, llGetKey(), OS_NPC_SIT_IMMEDIATE);
At the moment, sit only succeeds if the part has a sit target set.
NPC immediately sits on the target even if miles away - they do not walk up to it.
This method is in development - it may change so please don't trust it yet.
Standing will follow shortly since that's kind of important once you're sitting :)
2011-10-17 01:42:31 +01:00
978fb3d482
reduce access to ODECharacter methods to make code analysis easier. Eliminate redundant argument on ProcessTaints()
2011-10-15 01:41:39 +01:00
9cc2694776
restrict unnecessary access levels on ODEPrim fields/properties
2011-10-15 01:31:09 +01:00
f2132329a3
refactor: make methods that do not need to be public in ODE private or internal to aid code reading/analysis. Remove some unused method arguments
2011-10-15 01:20:40 +01:00
4bfc2f5cde
Change hardcoded ODE total frame time to match the default total frame time (0.09375 -> 0.089).
...
No apparant ill effects - because the default stepsize is 0.2, there are still 5 physics steps per physics frame.
This is a precursor to using the elapsed value passed in (and now changeable in config).
2011-10-14 21:07:57 +01:00
77c65951e0
Extract NullPhysicsScene from PhysicsScene to improve code readability
2011-10-14 01:38:14 +01:00
20da04fd0c
More method doc and formatting changes. Makes DestroyOdeStructures() private
2011-10-13 21:42:24 +01:00
227db07f2f
refactor: move 3x copy/pasted ode structure removal code in ODECharacter into a DestroyOdeStructures() method
...
also adds some method doc
2011-10-13 18:19:13 +01:00
b0ee174296
Merge commit '9090039324ecc45bf1005e719f61a80f0187cb73' into bigmerge
2011-10-12 01:41:44 +01:00
34954172a1
Merge commit '1e798136c3458b8255fcb6341713bf9dbb689f4b' into bigmerge
2011-10-11 22:23:16 +01:00
b9de3b7f5b
Merge commit 'f95033812402aaf31a9f2f66c946165d2d79669f' into bigmerge
...
Conflicts:
OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs
OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
prebuild.xml
2011-10-11 22:22:34 +01:00
341efb0942
Merge commit '6f542f73d4aacc0b92c2ebcff84b4ce2c8d9433b' into bigmerge
2011-10-11 22:12:25 +01:00
9090039324
Remove unused local variable i from OdeScene.Simulate()
2011-10-05 22:15:28 +01:00
1e798136c3
adjust some whitespace to trigger another build, to check the last failure was just a glitch
2011-09-17 01:33:55 +01:00
f950338124
Remove old bullet DotNET and X libraries in preparation for BulletS
...
These weren't working properly anyway.
You will need to rerun prebuild.sh/.bat after this commit, and maybe "nant clean" as well.
2011-09-17 01:09:25 +01:00
6f542f73d4
Stop the avatar stalling on its first boarder cross when using the ODE plugin
...
When upgrading the previously child agent to a root, the code was setting the Size parameter on the ODECharacter PhysicsActor.
This in turn reset Velocity, which cause the border stall.
I'm fixing this by commenting out the Velocity = Vector3.Zero lines since they don't appear to play a useful purpose
2011-09-16 23:57:16 +01:00
66dec3b874
Resolve merge commits, stage 1
2011-09-04 07:06:36 -07:00
96dce3e16c
Use GetMeshKey from PrimitiveBaseShape.
2011-08-29 10:10:48 -07:00
648866b597
Merge branch 'master' into bulletsim
2011-08-29 09:55:34 -07:00
18037d41c4
Move GetMeshKey from buried inside Meshmerizer to a public method on PrimitiveBaseShape
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2011-08-28 16:50:54 -04:00
80a2b81d52
Add level of detail specification to optionally reduce the number of vertices in generated prim meshes
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2011-08-28 16:49:25 -04:00
21708b832b
BulletSim: add mesh representation. Use meshes for static objects and switch to hulls for physical objects.
2011-08-26 15:51:21 -07:00
384cb79a1a
Merge branch 'master' into bulletsim
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
2011-08-19 14:49:16 -07:00
fef73a1a10
BulletSim: add runtime setting of physics parameters. Update default values.
2011-08-18 14:32:09 -07:00
951ffad81e
If SP.MoveToTarget has been called with a force walk, begin by landing the avatar.
...
There is a bug here - once an avatar has landed it glides to its new position instead of performing a walk animation
2011-08-11 00:23:54 +01:00
7f499ff3f3
Add a OS_NPC_LAND_AT_TARGET option to osMoveToTarget()
...
Default for this function is now not to automatically land.
This allows better control by scripts when an avatar is going to be landing on a prim rather than the ground.
Stopping the avatar involves faking a collision, to avoid the pid controller making it overshoot.
A better approach would be to gradually slow the avatar as we near the target
2011-08-10 23:56:19 +01:00
82f41fdcb5
BulletSim: fix problem with not convex hulling large objects by creating unit meshes and always scaling in Bullet
2011-08-05 14:53:39 -07:00
c3f579046c
Merge branch 'master' into bulletsim
2011-08-05 11:13:02 -07:00
7640b5abf6
BulletSim: Parameters settable from ini file. Linksets. Physical property value tuning
2011-08-05 11:01:27 -07:00
21d8a6b0e8
extend move test to check one beat of the simulator without actually asking the npc to move.
2011-08-03 23:06:18 +01:00
05e94ff27e
Move common gemo/agent map name code into CreateGeom()
...
Fix build break.
2011-08-01 07:04:13 +01:00
f9d6a91252
Instead of preserving old name in geom_name_map in change size or shape, use the Name property instead.
...
This is equivalent since the prim 'name' is never changed. In fact, this propery is never used for prims
2011-08-01 06:52:52 +01:00
40a78db182
comment out unused code in OdeScene.TriCallback()
2011-08-01 06:47:45 +01:00
ccb4b76242
On geom removal, remove the name from the OdeScene.geom_name_map too
2011-08-01 06:40:29 +01:00
f79df6f43f
remove the unused ODEPrim.prev_geom field
2011-08-01 06:35:59 +01:00
f32dbef647
When an ODE geom is removed (as when a non-phantom prim is deleted, resized or shape changed, also remove the OdeScene.actor_name_map entry pointing to the phys actor
...
This is to stop a small memory leak over time when prims are deleted or phantom-toggled
2011-08-01 06:32:30 +01:00
6618948ff9
refactor: centralize prim geom removal code from four places to one
2011-08-01 06:15:02 +01:00
509200d5cd
minor: add note to RemovePrimThreadLocked() to the effect that it contrary to the summary, it is being called from within Simulate() lock (OdeLock)
2011-08-01 05:48:27 +01:00
dfa2f7d715
If a prim changes size or shape, add actor to _parent_scene.actor_name_map with new prim_geom key, as the old one becomes invalid.
...
This resolves http://opensimulator.org/mantis/view.php?id=5603 where changing size or shape would stop collision_start being fired in a running script.
In both this and existing code we are not removing old actors from actor_name_map when the existing prim_geom is removed, which leads to a small memory leak over time.
This needs to be fixed.
2011-08-01 05:43:04 +01:00
2102964826
minor: indentation correction
2011-08-01 05:14:16 +01:00
d041276517
Remove _mesh field since the mesh data no longer needs to be stored after it's initially used.
...
This may improve memory usage for regions using mesh and sculpts, though I suspect that it doesn't address the current memory leak.
2011-07-31 01:03:52 +01:00
bd8f538f80
refactor: Remove argument to pass in an initial mesh to OdePrim since this is no longer required and it prevents removal of the _mesh field (which is only used temporarily)
...
If passing in a mesh becomes important again in the future then this can be reinstated.
2011-07-31 00:49:49 +01:00
196a774b24
minor: correct method doc for last commit
2011-07-31 00:45:20 +01:00
454312f5bc
refactor: rename CreateGeom _mesh argument to mesh, so as to not confuse this with the pre-existing _mesh field
2011-07-31 00:44:23 +01:00
f1ce17071d
minor: method doc
2011-07-31 00:43:02 +01:00
e08be91c84
Refactor: Replace instances of m_isphysical with IsPhysical rather than have some code reference the private var and other the public var without any functionality difference.
...
Add some method doc to IsPhysical
2011-07-30 23:44:47 +01:00
4f4d080461
refactor: Rename ODEPrim.ParentPrim() to AddChildPrim() for code readability
2011-07-30 23:20:43 +01:00
49a3740ee9
minor: remove mono compiler warnings, some code spacing adjustments
2011-07-30 03:56:29 +01:00
d917010433
minor: Add method doc to collision subscription methods. Change method case to reflect OpenSim standards.
2011-07-30 03:11:36 +01:00
310a685220
refactor: extract method that generates a physics mesh from prim shape data
2011-07-30 02:34:50 +01:00
4197f66052
refactor: extract code which generate points and faces from sculpt data into it's own method.
...
fix build break.
2011-07-30 02:22:05 +01:00
b0eacadeb4
fix bug in previous commit
2011-07-30 02:09:17 +01:00
122e01949d
refactor: move the code that generates physics meshs from prim mesh data into a separate method, in order to make the code more readable.
2011-07-30 02:08:32 +01:00
5043be13fb
Return null from CreateMeshFromPrimMesher if OpenJPEG decoding of the sculpt data fails.
...
This is to address http://opensimulator.org/mantis/view.php?id=5612
2011-07-29 21:49:23 +01:00
f3c5a5b745
fix extremely minor Ode bug where the _taintedPrimL list would always be cleared on every OdeScene.Simulate() even if it was already empty.
2011-07-29 01:18:42 +01:00
2a39d0cdb0
refactor: Move another chunk of ninja code out of the OdeScene.Simulate() loop for consistency and readability.
2011-07-29 00:51:07 +01:00
3f0d8f3cbf
refactor: Simplify reading OdeScene.Simulate() loop by shunting all the NINJA joints stuff into its own method.
...
Now if ninja joints isn't active (which is the default) don't have to wade through a lot of massively indented irrelevant code.
2011-07-29 00:39:02 +01:00
9c6227da66
refactor: unindent the OdeScene.Simulate() loop to ignore the long commented out ifs and locks
...
This is to make it more readable.
2011-07-29 00:23:42 +01:00
869883f2dc
BulletSim: fix buoyancy for prims. Start of configurable physics parameters.
2011-07-22 15:23:57 -07:00
5ffec1cd64
Pass collisions and updates in pinned memory (saves marshaling).
...
Fix folding feet by using collision normals.
Add constraint specification.
2011-07-22 10:23:40 -07:00
2c11f7fc38
Merge branch 'master' into bulletsim
2011-07-20 15:01:32 -07:00
3270bd560e
Removed unused AddPrimShape methods in PhysicsScene caused by merge conflicts
2011-07-20 14:34:02 -07:00
9fc7d65df7
Apply the localID to the Physics actor to prevent null calls later
2011-07-19 18:26:36 +01:00
18652eb87e
Fix physics proxy regeneration when a mesh with more than one submesh is resized
...
Addresses http://opensimulator.org/mantis/view.php?id=5584
2011-07-16 01:36:27 +01:00
e9dbe54ab1
Fix some local id issues in physics glue
2011-07-15 20:07:59 +01:00
c7dbd7cbd0
Fox some local id issues in physics glue
2011-07-15 19:36:00 +02:00
8dff9d564d
Revert "Add localid support to ch0de properly"
...
This reverts commit bb402d0d95
2011-07-15 19:35:49 +02:00
bb402d0d95
Add localid support to ch0de properly
2011-07-15 12:08:40 -07:00
cc69d12d54
Fix a raycast issue
2011-07-15 11:12:10 -07:00
3e456163dd
Port implementation of llCastRay() from Aurora.
...
I haven't been able to test this since the viewer won't parse the llCastRay() function. Maybe some activation cap is missing. Could wait until it is activated by default in the viewer.
2011-07-12 22:13:15 +01:00
d31e0a67f7
temporarily fix the build break with building the OdePlugin tests assembly.
...
This needs to be fixed properly.
2011-07-12 03:26:22 +01:00
f75f906e35
minor: remove whitespace to trigger another build
2011-07-12 03:13:05 +01:00
df0e5cc9fe
When a mesh object is added to a scene, delay adding the physics actor until the sculpt data has been added to the shape (possibly via an async asset service request)
...
This prevents spurious 'no asset data' for meshes added on startup.
2011-07-12 02:33:09 +01:00
b9cbe92f30
Merge branch 'master' into bulletsim
2011-07-11 12:23:20 -07:00
24efb021ff
minor Tack the prim name on the end of the "experimental mesh proxy generation" message.
...
Can probably comment out this message soon, once a few other issues are tidied up.
2011-07-11 04:23:30 +01:00
2f3d0e209f
When a sculpt/mesh texture is received by a part on a callback request, don't do the unnecessary work of copying the base shape.
...
Just setting the new base shape is enough to reinsert the sculpt data and set the taint.
Also cleans up a few more left-in debugging messages.
2011-07-11 03:13:59 +01:00
ce85675e70
comment out accidential ProcessTaints physics debug line left in code
2011-07-11 02:29:51 +01:00
c920ff9d1d
Merge branch 'master' into careminster-presence-refactor
2011-07-09 01:06:46 +01:00
5e8900dfd0
minor: code tidy and inserted log lines for future use.
...
Unable to get to the bottom of why resizing a mesh fails to properly reset the physics proxy, when toggling phantom does
After a mesh is generated, the existing sculptdata is set to zero in PrimitiveBaseShape to save memory
When phantom is toggled, the sculptdata is regenerated before remeshing.
But on resize, the sculptdata is not regenerated.
So clearly, resetting sculptdata is possible, but haven't quite been able to pin down how this is being done when phantom is toggled.
2011-07-09 00:35:30 +01:00
e8ad8593b6
refactor: eliminate redundant return statement
2011-07-08 20:58:44 +01:00
40300c886c
refactor: Factor out AddSubMesh() method from long CraeteMeshFromPrimMesher() method
...
Also remove some of the logging spam left in from the last commit.
2011-07-08 20:36:01 +01:00
b18ef976ff
Fix interpretation of physics mesh proxies from mesh data
...
As per http://wiki.secondlife.com/wiki/Mesh/Mesh_Asset_Format , some submesh blocks may just have the flag "NoGeometry" to signal that they provide no mesh data.
If a block contains this, ignore it for meshing purposes rather than suffer a ClassCastException
This fixes physics proxy meshing, so you can now walk through mesh doorways, properly stand on the trailer of mesh trucks, etc.
To get mesh physics proxy, the UseMeshiesPhysicsMesh must be true in a [Mesh] config section in OpenSim.ini (example in OpenSimDefaults.ini).
Convex hull physics not currently supported.
2011-07-08 19:43:22 +01:00
29034bc0e0
minor: code tidy up - remove a couple of Console.WriteLine() accidentally added in the last commit
2011-07-08 18:34:44 +01:00
36df9ae79a
refactor: Separate the OdeScene class into its own file from OdePlugin.cs, to improve code readability
2011-07-08 18:16:48 +01:00
1dcad4ac66
minor: commented out log lines for future use and very small code tidy
2011-07-08 17:58:01 +01:00
47cf9c8fe0
Merge branch 'master' into careminster-presence-refactor
2011-07-05 04:01:59 +01:00
5c18ebf424
Allow physics proxy generation for meshes using new asset format.
...
Fix an invalid cast exception while decoding new mesh asset format.
2011-06-29 17:36:41 -07:00
302d72701d
BulletSim initial checkin
2011-06-20 17:24:42 -07:00
6ae73aea49
Merge branch 'master' into careminster-presence-refactor
2011-06-20 03:11:34 +01:00
ad84728aba
Add localID to physical object creation functions.
2011-06-15 11:31:32 -07:00
a1c16a4200
Merge branch 'master' into careminster-presence-refactor
2011-06-11 12:08:02 +01:00
387b228d68
partial update for new mesh asset format - handle both old and new formats for physics mesh
2011-06-10 00:38:38 -07:00
9c1f799582
Implement llGodLikeRezObject and llGetUsedMemory
2011-05-22 21:01:31 +02:00
d1cf1fe3d7
Merge branch 'master' into careminster-presence-refactor
2011-04-30 14:37:37 +01:00
d565041e16
Fix crash when [Mesh] section is missing from configuration files
2011-04-29 15:49:10 -07:00
0c68fbdb1a
Merge branch 'master' into careminster-presence-refactor
2011-04-21 23:06:01 +01:00
5e99d93651
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-21 15:16:12 -04:00
d9055c8dc3
Group collada meshies settings under [Mesh] in OpensimDefaults.ini
2011-04-21 15:15:24 -04:00
09b6d717bf
Merge branch 'master' into careminster-presence-refactor
2011-04-21 16:28:29 +01:00
212326eeb0
fix meshing failure on sculpt maps smaller than 64x64
2011-04-19 22:16:10 -07:00
474910c9d6
Merge branch 'master' into careminster-presence-refactor
2011-04-17 18:48:53 +01:00
90b810c27e
force mesh proxy for simple box prims with path cut
2011-04-12 22:47:30 -07:00
566eff17de
Comment a very spammy debug message that was being output directly to console.
...
My last fox that makes bumping into sim borders/bans work makes this spam
endlessly.
2011-01-28 01:46:30 +01:00
bfa5b7850c
Fix drift of static prim.
2011-01-20 06:51:50 +00:00
ba7a227763
Revise Materials properties; Fix Double-Click Autopilot; Allow non-script sit positions >= 0.1M; Add llLookAt(); Comment out spammy bad adjacent sim message.
2011-01-04 21:36:09 +00:00
64209c9be1
Fix av/prim eject problem.
2010-12-29 21:13:49 +00:00
b23b29a53e
This fixes mantis #5198 and related. Physics is not my expertise, so I'm not 100% sure of what all the consequences of this change are. Pushing up, so others can take a look.
2010-12-24 16:23:00 -08:00
75010e5e1c
Merge branch 'master' into careminster-presence-refactor
2010-12-25 00:04:46 +00:00
2cc07de0ba
Merge branch 'master' into careminster-presence-refactor
2010-12-23 12:08:38 +00:00
46db73b62b
* Re-Adding Scene TimeDilation to Object Update Packets.
...
* Added Calculating Time Dilation in the OdePlubin
* When multiple object updates are stuffed into one packet, average the time dilation between them as a compromise.
* Time Dilation on the update is calculated when the EntityUpdate object is created. The pre-calc-ed TD is stored in the Entity update and used when it goes out on the wire. Previously, it was 1.0 all the time. The time dilation is tied to when the update is created, not when the update is sent.
2010-12-23 03:30:09 -05:00
5fccbe21d6
Update materials parameters.
2010-12-20 07:04:35 +00:00
8aa63093b1
Merge branch 'master' into careminster-presence-refactor
2010-12-12 01:20:46 +00:00
95a915efd8
Fix border fence for physicals. Fix llRotLookAt() for Vehicles.
2010-12-11 21:04:03 +00:00
3053f5ba7d
minor: remove some compiler warnings
2010-12-10 03:08:31 +00:00
bf695cccba
Fix spurious Av move when clothing item worn or removed.
2010-12-03 18:32:58 +00:00
2c1c04119d
Merge branch 'master' into careminster-presence-refactor
2010-11-25 01:24:32 +00:00
9f29908f66
catch an exception when a mesh asset header cant be decoded
2010-11-24 02:05:41 -08:00
ac370cf57b
Merge branch 'master' into careminster-presence-refactor
2010-10-25 01:24:30 +01:00
c74c1620a1
* Updated libomv to r3461
...
Main reason for upgrade is to revert API change that was introduced in order to support headerless binary LLSD decoding needed for deserialization of the mesh assets, which turned out to be unnecessary as we can transparently decode both kinds.
2010-10-24 23:51:46 +01:00
fc33d569cd
Merge branch 'master' into careminster-presence-refactor
2010-10-21 07:33:01 +01:00
9038218c2d
fix combining of multiple physics submeshes
2010-10-20 20:39:05 -07:00
bb7a755cba
Merge branch 'master' into careminster-presence-refactor
2010-10-18 20:30:46 +01:00
e3bd10829f
remove some cruft from last commit
2010-10-18 04:26:23 -07:00
7fa3335fd5
initial support for meshies physics. Must set ini option UseMeshiesPhysicsMesh = true to enable. See file OpenSimDefaults.ini for example.
2010-10-18 04:17:36 -07:00
455a2ba7de
Merge branch 'master' into careminster-presence-refactor
2010-10-16 02:27:51 +01:00
0308982c58
one more silly line ending thing.... *If you have problems, fetch the tree and rebase.
...
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2010-10-15 01:45:25 -04:00
bcdd03c1cf
more work in progress on mesh physics - still non-functional
2010-10-14 20:25:31 -07:00
2d88394cd5
laying some groundwork for mesh physics
2010-10-14 13:10:03 -07:00
cb79e228e4
Merge branch 'master' into careminster-presence-refactor
2010-10-10 22:08:36 +01:00
cf61cf7b32
* Make line endings consistant in Meshmerizer.cs
2010-10-09 13:50:53 -04:00
231feab57f
Merge branch 'master' into careminster-presence-refactor
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
2010-10-09 01:07:41 +01:00
9391c3ffee
add a flag in OpenSim.ini.example for enabling/disabling decoded sculpt map caching for meshing
2010-10-07 19:34:46 -07:00
d8149373c1
Merge branch 'master' into careminster-presence-refactor
2010-10-06 00:27:10 +01:00
bc9f793a92
Formatting cleanup.
2010-10-04 21:28:17 -04:00
fd56fd2ce8
Merge branch 'master' into careminster-presence-refactor
2010-10-02 19:51:43 +01:00
f220a2c5eb
Replace CalculateMass with a more accurate version, contributed by Ubit.
...
Thank you.
2010-10-02 00:24:16 +01:00
b40c91777c
Replace CalculateMass with a more accurate version, contributed by Ubit.
...
Thank you.
2010-10-02 00:19:30 +02:00
9f7f266f58
Replace CalculateMass with a better, contributed version
2010-10-02 00:18:52 +02:00
d0c271adc6
Typo fixes
2010-09-26 18:06:23 +01:00
aecac9bba9
Typo fixes
2010-09-26 18:05:55 +01:00
6f689f591a
Merge Master
2010-09-26 17:56:31 +01:00
b0b4782a2b
adding configurable j2kDecodeCache path
...
allowing the decoded sculpt map cache path to be defined in
the configuration files.
Use DecodedSculpMapPath in the [Startup] section to set
the path. The default is still ./bin/j2kDecodeCache
2010-09-26 17:04:11 +01:00
4fbdcb95a0
Merge branch 'master' into careminster-presence-refactor
2010-09-25 06:19:26 +01:00
83b16612ce
Experimental locking of taint processing
2010-09-25 05:57:08 +02:00
30d3e8a13e
Add prim name to OdePrim Error and Warning messages.
...
This aims to make it easier to identify and remove rogue prims that are causing ODE to fall over.
2010-09-25 01:07:37 +01:00
c719e016ed
Falling animation fix, comment out instrumentation.
2010-09-06 21:45:07 +00:00
16814dd8f1
Fixes to JUMP system.
2010-09-02 21:51:19 +00:00
0871d20adb
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-04 21:08:14 +00:00
cb3b124df9
Fixes fresh hollowed prim collision shape.
2010-08-04 21:08:00 +00:00
e3cea888fb
Fix some more issues causing regions with corrupt sculpts to freeze.
2010-08-03 16:07:18 -07:00
1d1da5069c
Catch a meshing exception caused by corrupt or missing sculpt maps, and mark the prim as "mesh failed" so it doesn't try meshing continuously
2010-08-03 14:11:11 -07:00
d2d1c63b17
Revert "Catch meshing error in Meshmerizer"
...
This reverts commit 8f2986bc6a
2010-08-03 05:25:01 +02:00
8f2986bc6a
Catch meshing error in Meshmerizer
2010-08-02 21:54:47 -07:00
236c0f8e8b
Fix llSetForecAndTorque([0]) stops linear motion. Mantis #187
2010-07-16 22:17:06 +00:00
7ab103c96f
Rewrite collision dictionary handling, cleans up deleted obects/avs. Fixes occasional collision event failure. ChOde only.
2010-07-13 20:37:13 +00:00
ba38c697e8
Merge branch 'master' into careminster-presence-refactor
2010-06-27 20:05:55 +01:00
4a5979c311
minor: remove some mono compiler warnings
2010-06-25 21:09:15 +01:00
04b60aa490
Merge branch 'master' into careminster-presence-refactor
2010-06-19 20:32:01 +01:00
1e7ce6dbce
Hunting for the problem in #4777
2010-06-19 09:44:02 -07:00
9b410f5e94
Reverting my last two commits, putting back Melanie's exception handler. Doesn't solve #4777 .
2010-06-19 09:25:36 -07:00
f0f684161e
Reinstated the behavior of AddPrimShape *exactly* as it was as of December. Trying to fix mantis #4777
2010-06-19 08:57:58 -07:00
891214c65b
Merge branch 'master' into careminster-presence-refactor
2010-06-18 20:49:21 +01:00
47d5f90629
Remove an error in meshing error reporting. Now doesn't double-bomb
...
anymore on a bad sculpt
2010-06-18 19:49:14 +01:00
d2342319da
Merge branch 'master' into careminster-presence-refactor
2010-06-12 16:27:37 +01:00
ceac35bac1
Log and eat sculpt meshing exceptions caused by bad jp2 data.
2010-06-12 16:25:40 +01:00
6e2cc98eac
Fixed llMoveToTarget() and Rotation Lock/Enable (ChODE/ODEPrim only)
2010-06-08 16:15:16 -04:00
97501495eb
Merge branch 'master' into careminster-presence-refactor
2010-05-26 17:19:02 +01:00
5e719d13ef
fix sculpt normal direction for mirrored plane sculpts
2010-05-24 19:15:04 -07:00
420dd78fb7
Merge branch 'careminster' into careminster-presence-refactor
2010-05-08 14:17:43 +01:00
14fcc2510e
Merge branch 'master' into careminster-presence-refactor
2010-05-08 13:31:36 +01:00
a58859a0d4
GridUserService in place. Replaces the contrived concept of storing user's home and position info in the presence service. WARNING: I violated a taboo by deleting 2 migration files and simplifying the original table creation for Presence. This should not cause any problems to anyone, though. Things will work with the new simplified table, as well as with the previous contrived one. If there are any problems, solving them is as easy as dropping the presence table and deleting its row in the migrations table. The presence info only exists during a user's session anyway.
...
BTW, the Meshing files want to be committed too -- EOFs.
2010-05-07 21:29:56 -07:00
add7abc1de
Fix Mouse+WASD makes Av rise; Fix PREJUMP.
2010-05-07 14:12:07 -04:00
eb6d63ab8e
improve handling of undersize sculpt textures
2010-05-06 23:02:24 -07:00
39c5ddc837
corrections for face numbering and uv mapping, mostly for spheres - sync with PrimMesher r56
2010-05-06 22:08:59 -07:00
5d1e9947ed
Sculpt meshing refactoring - improves mesh accuracy and UV mapping
...
Sync with PrimMesher r55
2010-05-06 21:36:27 -07:00
f3c21524be
Fix Av jump motion S/W
2010-04-29 19:41:08 -04:00
f06772a088
Merge branch 'careminster' into careminster-presence-refactor
2010-04-29 23:33:20 +01:00
5c23b4aa56
Fix vertical attractor
2010-04-29 13:50:11 -04:00
9920e219dd
Merge branch 'careminster' into careminster-presence-refactor
2010-04-13 04:36:08 +01:00
9b6e89457c
Fixed LINEAR_MOTOR Z drive, Mantis #30
2010-04-11 14:12:01 -04:00
ba31b31ed0
Merge branch 'careminster' into careminster-presence-refactor
2010-04-05 18:22:15 +01:00
e2a521742a
ChODE Only: Corrected Heightmap load to iliminate crack at 255M. Added 'fence' option to prevent physical objects crossing region border.
2010-04-04 22:57:32 -04:00
add47befac
Update acceleration to 0 on no tphysical.
2010-03-19 18:53:16 -04:00
4c2a51b1b5
Merge branch 'master' into careminster-presence-refactor
2010-03-18 20:09:04 +00:00
65c1fbc14d
Fixing line endings
2010-03-15 20:54:48 -07:00
d3f33acc1a
Merge branch 'master' into careminster-presence-refactor
2010-03-15 17:23:35 +00:00
8198062610
RotLookAt repaired; debug msg cleanup.
2010-03-14 16:22:13 -04:00
1e73e16fd0
flip UVs for profile faces
2010-03-13 18:41:36 -08:00
41a98b902b
correct some references which could produce erroneous prim face numbers
2010-03-12 22:05:22 -08:00
1d14cf8c3f
some improvements to sculptmap alpha handling and LOD
2010-03-12 21:21:28 -08:00
3036aba875
* Added a better check to the SimianGrid connectors to test if they are enabled or not. This method should work equally well with standalone or robust mode
...
* Applying #4602 from Misterblu to add collision detection to BulletDotNET
2010-03-12 14:28:31 -08:00
1379ae4310
Fix Rotation Lock. NOTE: This version had poor border crossing control
2010-03-12 16:13:52 -05:00
7bd48d383d
Resolved merge
2010-03-12 13:48:31 -05:00
f6f6ef1532
Dynamics Integration Part 1
2010-03-11 19:12:38 -05:00
2fdd535302
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2010-03-06 12:24:26 +00:00
1f7a0cf892
Merge branch '0.6.9-post-fixes' into careminster
2010-03-06 12:24:09 +00:00
87590491b5
Fix Physics angular reference frame.
2010-03-04 16:33:26 -05:00
300f4c58a6
Separate PhysX classes into separate files.
2010-02-22 13:16:40 +09:00
af265e001d
Formatting cleanup.
2010-02-15 19:21:56 +09:00
9821c4f566
Revolution is on the roll again! :)
...
Fixes: Undo, T-pose of others on login, modifiedBulletX works again, feet now stand on the ground instead of in the ground, adds checks to CombatModule. Adds: Redo, Land Undo, checks to agentUpdate (so one can not fall off of a region), more vehicle parts. Finishes almost all of LSL (1 function left, 2 events).
Direct flames and kudos to Revolution, please
Signed-off-by: Melanie <melanie@t-data.com>
2010-02-14 22:18:46 +00:00
9568718add
Angular motor adjustments
2010-02-12 15:56:21 -05:00
6a70349512
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-02-12 14:08:32 -05:00
c8f3bb56ff
Merge branch 'master' into careminster
2010-02-08 22:11:38 +00:00
8556a9f1a8
Applying patch #4534 by Misterblue to fix ODE physics stickiness
2010-02-04 13:31:06 -08:00
48134af616
Motor angular decay fix.
2010-02-03 16:20:13 -05:00
8c20610293
AngMotor update 1
2010-02-02 13:28:42 -05:00
1abb70cc73
Add glue for llSetVehicleFlags(), llRemoveVehicleFlags(). ChODE: Add associated methods.
2010-01-21 19:31:02 -05:00
66692f90e3
ChODE Object Linear Motion update
2010-01-21 14:39:11 -05:00
253e2ed699
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-01-03 23:10:01 -05:00
61ce884336
Merge branch 'master' into careminster
2010-01-03 21:43:39 +00:00
70d5b1c34c
Formatting cleanup. Add copyright headers.
2010-01-04 06:17:30 +09:00
3f901d313b
Vehicle Linear parameter adjustments
2009-12-31 16:07:36 -05:00
e7439efc74
Recover out-of-region objects during db load.
2009-12-24 19:19:44 -05:00
93b930b937
Fix conflicts
2009-12-22 00:33:31 -05:00
0a29842caf
Include ChOdePlugin
2009-12-22 00:20:04 -05:00
fa0621b486
Merge branch 'master' into careminster
2009-12-22 00:41:56 +00:00
e530180c1e
Glue code for a couple of new LSL function implementations
2009-12-22 00:26:12 +00:00
6483470ec5
Fix GetWorldRotation(), and a host of related Sit fixes.
2009-12-17 02:54:02 -05:00
b310efc50f
Merge branch 'master' into careminster
2009-12-12 12:54:43 +00:00
2f8b9cbf2b
* Commit some sit code that's commented out for now.
2009-12-08 11:28:13 -05:00
09bbfc1d56
Merge branch 'master' into careminster
2009-12-06 03:01:58 +00:00
8d196dbd14
* Adds Normal to the fields returned by the Physics Raycaster
...
* Fixes recognizing when a sit target is and isn't set.
* * 1. Vector3.Zero.
* * 2. Orientation: x:0, y:0, z:0, w:1 - ZERO_ROTATION
* * (or) Orientation: x:0, y:0, z:0, w:0 - Invalid Quaternion
* * (or) Orientation: x:0, y:0, z:1, w:0 - Invalid mapping, some older objects still exist with it
2009-12-05 22:18:00 -05:00
43a6fa1d01
Merge branch 'master' into careminster
2009-12-05 19:53:54 +00:00
c4b6010fb3
* Fixes mantis 4416. Animator is dereferenced on logout
2009-12-05 13:01:21 -05:00
781db43a76
* Fixes the 10x10x10 hard physics limitation. (wierdly, you have to set this for each region in your Regions.ini[PhysicalPrimMax = 10(default)])
...
* Adds a configurable maximum object mass before the mass is clamped. Default is 10000.01. Configurable by changing maximum_mass_object in the [ODEPhysicsSettings] section.
* Clamping the mass is important for limiting the amount of CPU an object can consume in physics calculations. Too high, and the object overcomes restitution forces by gravity alone. This generates more collisions potentially leading to 'deep think'.
2009-12-03 20:21:10 -05:00
cc18ab12f8
Merge branch 'master' into careminster
2009-11-27 00:40:56 +00:00
e2200026ca
* Fixes a case of d.BodyEnable with IntPtr.Zero passed as the parameter in linkset where EnableBody was called and the body is immediately disabled. The previous functionality assumed that a body was received in EnableBody but.. in some cases, it wasn't.
2009-11-26 17:03:00 -05:00
cad2bf5b08
Merge branch 'master' into careminster
2009-11-24 16:00:35 +00:00
3ebb528c79
* Resolves mantis 4390 http://opensimulator.org/mantis/view.php?id=4390
2009-11-23 11:44:22 -05:00
df121a7cd0
Merge branch 'master' into careminster
2009-11-23 04:24:58 +00:00
21f80b6507
* Adds a test for if the collision is at the bottom of the capsule on avatar. This prevents the 'double jump' capability that's been occurring for ages when avatar collide with prim on the side.
2009-11-22 22:04:52 -05:00
9ba10af6b2
* Added missing lock to m_forcelist when AddForce is called. When a user dragged a prim, in some cases, it would corrupt the datatype in memory and throw spurious IndexOutOfRangeExceptions.
...
* Physics a situation that causes physics to spew redline messages to the console forever.
2009-11-22 21:08:54 -05:00
0844e5951c
Merge branch 'master' into careminster
2009-11-21 16:00:18 +00:00
7760da1a4c
* Fixes the second of two terse update issues. Physical objects should react normally again.
2009-11-21 04:39:41 -05:00
0ffda7128e
* Fixes one of two terse update issues. There's still one left, but this one fixes the situation where the object on the server is moving but no updates are being sent.
2009-11-21 04:33:34 -05:00
7f0f5060ec
Clean up messages in ODE
2009-11-19 20:13:26 +01:00
4c10826caa
Fix merge conflicts
2009-11-16 02:12:56 +01:00
873c9098d8
Merge branch 'careminster' into tests
2009-11-16 01:40:15 +01:00
8ae3df22a2
clean up some cruft
2009-11-11 11:10:42 -08:00
6d88c96e01
minor: remove mono compiler warning
2009-11-11 18:49:05 +00:00
3e22bb24f5
add an overload to _SculptMesh for meshing from a list of coordinates
...
add conditional compilation for System.Drawing dependency
2009-11-09 18:44:03 -08:00
a88a463b50
Following various discussions on irc and in the OpenSim dev OSGrid meeting last week, change av_capsule_tilted to false by default
...
This appears to now give better ODE physics response (less sinking into the ground, etc.)
Please change it back if this is actually a bad idea for some reason
2009-11-09 19:26:42 +00:00
3274bc39c8
minor: remove some mono compiler warnings
2009-11-09 17:43:32 +00:00
af0e5d0974
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-11-03 19:11:09 +00:00
1d737b010c
minor: remove some mono compiler warnings
2009-11-03 18:52:20 +00:00
82554e9a89
Delete depricated extrusion methods and redirect to universal extrude method.
...
Sync with PrimMesher.cs r47 on forge.
2009-11-02 22:24:58 -08:00
7132877075
* Log progress messages when loading OAR files with a lot of assets
...
* Change the PhysicsCollision callback for objects to send full contact point information. This will be used to calculate the collision plane for avatars
* Send the physics engine velocity in terse updates, not the current force being applied to the avatar. This should fix several issues including crouching through the floor and walking through walls
2009-10-29 01:46:58 -07:00
1c9696a9d2
Always send a time dilation of 1.0 while we debug rubberbanding issues
2009-10-28 15:11:01 -07:00
a069a1ee68
Limit physics time dilation to 1.0
2009-10-28 14:44:05 -07:00
a65c8cdc38
* Reduce the velocity tolerance on sending terse updates to avoid slowly drifting prims/avatars
...
* Added contacts_per_collision to the ODE config section. This allows you to reduce the maximum number of contact points ODE will generate per collision and reduce the size of the array that stores contact structures
2009-10-28 12:45:40 -07:00
ee0f7e10c8
Fixed a bad check on velocity in the ODE near() callback (it was only checking for velocity in certain directions, and was calling the get_Velocity() function three times)
2009-10-28 12:20:34 -07:00
2d470f8bde
Switching sculpty from CSJ2K back to OpenJPEG for now until more kinks are ironed out
2009-10-28 01:48:53 -07:00
e31024f08b
Print the exception message when CSJ2K decoding fails for sculpty textures
2009-10-28 01:30:39 -07:00
0c466b28bb
Move the calculation of time dilation from the scene to the physics engine. The scene is still the one reporting dilation so this does not break the API or remove flexibility, but it gets the calculation happening in the right place for the normal OpenSim usage. The actual calculation of physics time dilation probably needs tweaking
2009-10-27 16:24:43 -07:00
1113b3b6eb
Merge branch 'vehicles' into tests
...
Conflicts:
OpenSim/Region/Physics/Manager/PhysicsActor.cs
OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
2009-10-27 22:42:55 +01:00
a81a16f22f
llRotLookAt Pt 2
2009-10-27 19:56:39 +01:00
f5cad91578
* Switched from OpenJPEG to CSJ2K in Meshmerizer
...
* Tested the previous patch and found no regressions
2009-10-26 19:03:55 -07:00
d199767e69
Experimental change of PhysicsVector to Vector3. Untested
2009-10-26 18:23:43 -07:00
119cf80e13
Added calls to GC.AddMemoryPressure() when unmanaged memory is allocated for ODE (helps the GC make better scheduling choices), and a call to GC.Collect() right before logins are enabled for a region. Although this doesn't change actual memory usage, it improves the reported usage from OpenSim and the operating system
2009-10-26 15:52:59 -07:00
428bd7a74b
No need to create dupe TriMeshData for ODE. A previous patch created a dictionary to store unique meshes in Meshmerizer based on creation params. This patch contains a dictionary to map each of those unique meshes to its ODE TriMeshData. This eliminated hundreds of megabytes of memory consumption in the unmanaged heap when there are lots of the same prim (roof tiles, bricks, siding, decks, chairs, etc). The objects do not need to be physical to benefit from this patch.
2009-10-26 15:14:19 -07:00
ff4b45a1e3
Do case-insensitive comparisons on region names in LLStandaloneLoginModule
2009-10-26 15:12:43 -07:00
ac7ccdf7d7
* Changed the watchdog timer to improve the speed of UpdateThread(), only track threads once the first call to UpdateThread() has been made, and allow re-tracking of threads that timed out but revived later
...
* Added a commented out call to Watchdog.UpdateThread() in OdeScene. If it turns out that loading a large OAR file or some other operation is timing out the heartbeat thread, we'll need to uncomment it
2009-10-26 14:41:27 -07:00
8428b25939
Add llRotLookat pt1.
2009-10-26 00:10:23 +01:00
730930955a
Changing Scene.ForEachClient to use the synchronous for loop instead of Parallel. This is quite possibly the source of some deadlocking, and at the very least the synchronous version gives better stack traces
...
* Lock the LLUDPClient RTO math * Add a helper function for backing off the RTO, and follow the optional advice in RFC 2988 to clear existing SRTT and RTTVAR values during a backoff
* Removing the unused PrimitiveBaseShape.SculptImage parameter * Improved performance of SceneObjectPart instantiation * ZeroMesher now drops SculptData bytes like Meshmerizer, to allow the texture data to be GCed * Improved typecasting speed in MySQLLegacyRegionData.BuildShape()
* Improved the instantiation of PrimitiveBaseShape
2009-10-25 00:40:21 -07:00
8ba3afb59b
Patch from dslake http://opensimulator.org/mantis/view.php?id=4291 0004291: Inconsistent locking of ODE tainted prims
2009-10-23 12:14:05 -04:00
f34e8adffb
* Moved Copyrights above the comments in ODEPrim and ODEDynamics so they're consistent with the rest (and so chi11ken's auto copyright adding script doesn't duplicate the copyright.
2009-10-22 18:28:42 -04:00
91084653bd
Commented out instrumentation in ODEPrim.cs
2009-10-22 21:14:00 +02:00
227c832d3b
Commented out instrumentation in ODEPrim.cs
2009-10-22 19:15:35 +01:00
c4969d47d9
Merge branch 'master' into vehicles
2009-10-22 07:12:10 +01:00
8151190a45
* Removing ODEPrim and ODECharacter GetHashCode() overrides since they were based on something that could change
...
* Tweaked a few other GetHashCode() overrides to bring them in line with MSDN recommendations
2009-10-20 10:56:15 -07:00
72078195c2
Merge branch 'prioritization' of ssh://opensimulator.org/var/git/opensim into prioritization
2009-10-19 15:20:38 -07:00
bd03cbd815
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into prioritization
2009-10-19 15:19:37 -07:00
590d91e572
Forgot {} on last commit.
2009-10-19 15:03:55 -07:00
2dd8a6beac
More instrumentation in physics.
2009-10-19 14:48:17 -07:00
ffd59868f5
Merge branch 'master' into vehicles
2009-10-19 21:58:51 +01:00
6d04a213d6
Merge branch 'prioritization' of ssh://opensimulator.org/var/git/opensim into prioritization
2009-10-18 20:25:16 -07:00
0d29614ca1
Formatting cleanup.
2009-10-19 08:58:03 +09:00
baed19d068
A bit of instrumentation to figure out what's going on with physics actors.
2009-10-18 16:48:44 -07:00
2f2eeb6731
Zero out PrimitiveBaseShape.SculptData after the JPEG2000 data has been decoded to allow garbage collection on it
2009-10-18 02:53:36 -07:00
01051daaab
* One more tweak to inform the user that they may not be able to move until relogging.
2009-10-16 21:24:08 -04:00
d49424c421
* After seeing it repeat over and over again.. again, We won't inform the scenepresence that there was an issue so it doesn't try to make the capsule again. I have a feeling that this is some kind of object leak. We'll know for sure.. soon.
2009-10-16 21:20:55 -04:00
0079d0a7c4
* One more attempt at the NullRef In The OdePlugin. This might fix it, but it will definitely get us closer to the root cause.
2009-10-16 14:30:55 -04:00
1f28c6208b
* Added a message for when the null reference exception occurs to make debugging easier. Without this, from the user's perspective.. they cannot move, fly or otherwise do anything physical and without a message on the console, it would be hard to tell that this is what is occurring.
2009-10-16 03:40:44 -04:00
ac2f98b846
* A hacky attempt at resolving mantis #4260 . I think ODE was unable to allocate memory, and therefore the unmanaged wrapper call fails or worse.. there's some unmanaged resource accounting in the ODEPlugin for ODECharacter that isn't being done properly now.
...
* The broken avatar may not be able to move, but it won't stop simulate from pressing on now. And, the simulator will try to destroy the avatar's physics proxy and recreate it again... but if this is what I think it is, it may not help.
2009-10-16 03:32:30 -04:00
6deef7d0f3
Merge branch 'master' into vehicles
2009-10-15 21:14:13 +01:00
3828b3c0e8
* Eliminated unnecessary parameters from LLUDPServer.SendPacketData()
...
* Changed PrimMesher's Quat.Identity to return <0,0,0,1> instead of <0,0,0,1.1>
2009-10-13 10:38:35 -07:00
70553a979e
Merge branch 'master' into vehicles
2009-10-12 15:12:15 +01:00
50f509d600
Merge branch 'master' into vehicles
2009-10-12 15:11:01 +01:00
fe0940a22f
Optimize ODE mesh by removing sleep. On a region with 100,000 prims and ODE enabled, the first Heartbeat loop call to UpdatePhysics takes 20 minutes. 75% of that time is spent in this sleep. (100k prims * 10ms)
2009-10-12 01:53:57 -07:00
7b4183d7a0
sync PrimMesher with r46
2009-10-11 02:12:17 -07:00
41b27ef064
disambiguate System.Path (preparation for new PrimMesher)
2009-10-11 01:30:24 -07:00
8271528b1f
* comment out the velocity test, using updates every 500 ms as set in ScenePresence.AddToPhysicalScene.
...
* This causes time to be counted in ODECharacter and, when a collision occurs, the physics scene will report the collisions only if the the difference of last time it reported the collisions from now was more then the set ms.
* This is cool because the time accrues while collisions are not taking place and when they do take place again, you get an immediate update.
2009-10-10 04:01:36 -04:00
4ffe936ba8
* Make ODECharacter respect the scene's requested collision update time
...
* Set the Scene collision update time to 500 ms
2009-10-10 03:53:53 -04:00
d06c7d90a1
Correct a build break caused by an optimization in trunk
2009-10-07 06:56:00 +01:00
0374f1b144
Merge branch 'master' into vehicles
2009-10-06 17:44:59 +01:00
10c4b88ccf
minor: remove mono compile warning
2009-10-05 18:20:37 +01:00
8d5a40aad0
Merge branch 'master' into vehicles
2009-10-05 12:58:52 +01:00
6d52974c5f
Eliminate pinned Mesh data on managed heap by using IntPtrs to memory allocated on the unmanaged heap. This prevents fragmentation of the managed heap and the resulting stress on GC. A region with ~150,000 prims using ODE and Meshmerizer saw memory remain flat around 1.2GB as opposed to 1.5GB and continually growing due to pinned memory. This patch complements the unique mesh dictionary patch applied to Meshmerizer but is independent. The net effect is a 60-75% reduction in memory for our largest regions.
2009-10-05 12:45:41 +01:00
0744292b47
Merge branch 'master' into vehicles
2009-10-05 10:17:23 +01:00
5c593f3892
only cache mesh if meshing was successful
...
re-enable sculpt mesh caching
2009-10-04 20:01:44 -07:00
95ebb7794c
flexible extrusion shape defaults to linear
2009-10-04 02:59:12 -07:00
0cbd9eee2f
Exclude sculpt proxies from mesh caching
2009-10-04 02:14:13 -07:00
9eccea5777
Merge branch 'master' into vehicles
2009-10-02 19:53:42 +01:00
31d8cec0f8
Merge branch 'master' into diva-textures
2009-10-02 08:23:38 +01:00
41ff39414b
Merge branch 'master' into vehicles
2009-10-01 14:08:15 +01:00
1eb6f99d19
Create j2k cache directory if it doesn't exist. The Meshmerizer needs it there.
2009-09-30 20:27:40 -07:00
606e831ff5
Formatting cleanup.
2009-10-01 09:38:36 +09:00
07df0e0ab0
Merge branch '0.6.7-post-fixes' into vehicles
2009-09-30 19:07:18 +02:00
827b0fb199
Commit initial version of KittoFlora's vehicle changes
2009-09-30 18:51:02 +02:00
ee205e7e81
Formatting cleanup.
2009-10-01 01:17:47 +09:00
f00126dc2d
Add copyright header. Formatting cleanup.
2009-09-29 08:32:59 +09:00
fb2cabd6b3
corrections to viewerMode AddPos()
2009-09-25 13:01:48 -07:00
1b2828f5d8
Meshmerizer stores dictionary of unique Meshes keyed on construction parameters. CreateMesh() returns a Mesh from the dictionary or creates a new Mesh if it has not been created before. Meshes are never purged from the dictionary. The raw Mesh data is discarded once the memory is pinned for ODE use. All copies of the same prim/mesh use the same pinned memory. ONLY IMPLEMENTED AND TESTED WITH MESHMERIZER AND ODE
...
Signed-off-by: dahlia <dahliaTrimble@gmailDotCom>
2009-09-24 18:20:59 -07:00
daffb69174
modify BulletDotNETPrim.cs in preparation for Mantis #4181
2009-09-24 18:16:29 -07:00
56edbe9b60
Alternate algorithm for fixing avatar capsule tilt (Mantis #2905 )
...
Eliminate dynamic capsule wobble. Instead introduce a small, fixed
tilt, and allow the tilt to rotate with the avatar while moving; the
tilt always faces away from the direction of avatar movement. The
rotation while moving should eliminate direction-dependent behavior
(e.g. only being able to climb on top of prims from certain directions).
Falling animation is still too frequently invoked.
Ideally the tilt should be completely eliminated, but doing so
currently causes the avatar to fall through the terrain.
2009-09-18 11:39:08 +09:00
0683cf6e0d
Add test to check behaviour if an iar is loaded where no user profile exists for the creators
...
Disable generation of temporary profiles for now, instead record loading user as creator
2009-09-09 18:03:49 +01:00
b93f512433
* Fix for GetTerrainHeightAtXY to make it compatible when Constants.RegionSize isn't 256
2009-09-04 02:48:07 -04:00
bb5857c4bb
* Fixes the function 'GetTerrainHeightAtXY'
2009-09-04 00:03:54 -04:00
6cf610bc44
eliminate unnecessary storage of mesh objects which are no longer necessary after recent startup optimizations
2009-09-02 17:40:55 -07:00
56ddd6828c
Add copyright headers. Formatting cleanup.
2009-09-03 02:04:17 +09:00
9505297fb1
* One last attempt to get the bordercrossing/primcrossing/attachmentcrossing right in the new border framework.
...
* This also contains some inactive preliminary code for disconnecting combined regions that will be used to make one root region a virtual region of a new root region.
2009-09-02 04:39:00 -04:00
f32de6fe88
Thank you, dslake, for a set of patches to improve OpenSim startup
...
and idle performance.
2009-09-02 03:33:31 +01:00
c89fc36f28
Applying Mantis #4079 . Thank you, dslake
2009-09-01 02:17:08 +01:00
54e05a083d
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-26 11:48:05 -04:00
cf2d1b5c10
Add copy constructor to PhysicsVector.
2009-08-26 14:28:54 +09:00
256624566f
Formatting cleanup, minor refactoring.
2009-08-26 14:02:01 +09:00
e1b38ff001
* It turns out that Physics heightmap values were being stored in managed memory in _heightmap and using multiple heightmaps caused them all to overwrite each other and the last one was the heightmap for all of the regions. This fixes that. It also reduces the terrain resolution to half.
2009-08-21 13:22:49 -04:00
64dcb71c14
* Fixes Terrain issues with combined regions.
2009-08-20 23:26:40 -04:00
311b51a184
*remove conflicts
2009-08-18 11:09:43 -04:00
c54cb59a71
* Some Physics Scene Changes to prepare for larger regions
2009-08-18 11:05:07 -04:00
9ad3e72ae1
Did I say that i don't like git? Remove some stuff that shouldn't have
...
gone in.
2009-08-17 22:06:51 +01:00
644db1e540
Add System.Xml reference to the console project
2009-08-17 09:40:38 +01:00
9d9fcac038
Misc cleanup.
2009-08-16 17:14:21 +09:00
30ce56e721
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-15 13:10:21 -04:00
8000812700
* part one of adding physics combining
2009-08-15 13:10:10 -04:00
1123a326ab
Formatting cleanup. Fix some compiler warnings.
2009-08-13 15:43:24 +09:00
3e247a8eaa
Minor: formatting cleanup.
2009-08-11 00:32:59 +09:00
8863092f7c
Split BasicPhysics classes into separate files.
2009-08-11 00:32:59 +09:00
e88903f481
* Fix one physics crash for regions larger then 512mx512m
2009-08-08 10:38:53 -04:00
2b990a61bf
This is the second part of the 'not crash on regionsize changes'. This lets you configure region sizes to be smaller without crashing the region. I remind you that regions are still square, must be a multiple of 4, and the Linden client doesn't like anything other then 256. If you set it bigger or smaller, the terrain doesn't load in the client, the map has issues, and god forbid you connect it to a grid that expects 256m regions.
2009-08-07 20:31:48 -04:00
c8a68fb3fb
* Remove hard coded 256 limitations from various places. There's no more 256m limitation within the OpenSimulator framework, however, the LLClient ClientView does not support regions larger then 256 meters so, if you try and make your region larger by setting Constants.RegionSize = 512; in OpenSim.Framework.Constants.cs, the terrain will not display on clients using the LLUDP protocol
2009-08-07 18:40:56 -04:00
190bdc8a2e
* Remove some mono compiler warnings
2009-08-05 17:33:23 +01:00
21e62e87c7
starting to refactor path generation out of prim extrusion
2009-08-03 22:59:47 -07:00
6c94ce1cca
Flag certain meshes to avoid vertex list compaction. This should help speed up meshing time at startup.
2009-07-30 07:06:23 +00:00
a133e83f3a
Formatting cleanup.
2009-07-23 15:32:11 +00:00
e2e43f1ab7
* Whoops, forgot the water heightfield.
2009-07-22 04:11:51 +00:00
9f4b8260c2
* Exclude heightfield geom from the raycast test.
...
* Fixes mantis #3922
2009-07-22 04:04:30 +00:00
156c393a44
* nothing in this commit, re-triggering panda.. which crashed while testing.
2009-07-21 03:28:12 +00:00
5c8fe5c01c
* Fixed a case where a prim was a NullPhysicsActor instead of an OdePrim
...
* Commented logic that wasn't being used.
* This should fix the errors in OdeScene.near
2009-07-21 03:18:19 +00:00
08819bcbea
* Created a way that the OpenSimulator scene can ask the physics scene to do a raycast test safely.
...
* Test for prim obstructions between the avatar and camera. If there are obstructions, inform the client to move the camera closer. This makes it so that walls and objects don't obstruct your view while you're moving around. Try walking inside a hollowed tori. You'll see how much easier it is now because your camera automatically moves closer so you can still see.
* Created a way to know if the user's camera is alt + cammed or just following the avatar.
* Changes IClientAPI interface by adding SendCameraConstraint(Vector4 CameraConstraint)
2009-07-19 02:32:02 +00:00
01446074b1
Revert the nonessential part of r10033 to restore sanity to trampolines
2009-07-16 19:09:03 +00:00
8e1ab33ed3
* Tweaking collision reporting a little more in ScenePresence to not check if the collisions will affect health if the avatar is invulnerable. (saves 3 loops)
2009-07-16 04:50:49 +00:00
56d295cfb5
Fix for avatar falling through terrain when av_capsule_tilted=false, Mantis #2905
...
This fix re-introduces a small tilt into the capsule to prevent
avatar falling through terrain. Re-introduction of the tilt means
that some direction-dependent behavior when walking over prims, but
I have tried to minimize this.
Additionally this commit allows the capsule to wobble slightly when
being pushed around the terrain. This should make walking over prims
easier, as the capsule can wobble and glide diagonally over the prim's
edge, instead of rigidly being stopped vertically against the prim's
face.
2009-07-15 10:09:37 +00:00
750f75c514
Thank you, Twitch, for a patch to restore mayhem and murder to OpenSim
...
Fixes Mantis #3888
2009-07-14 23:20:59 +00:00
73251ed346
add a constructor overload and an AddPos method to SculptMesh
2009-07-14 06:09:18 +00:00
3f2ee8915d
Some improvements to prim face numbering - only affects viewers using PrimMesher
2009-07-11 04:53:41 +00:00
0ec6dfb1a1
Experimental fix for tilted avatar capsule, Mantis #2905
...
Set av_capsule_tilted to false in opensim.ini. Default is true, so there is
no change in avatar behavior (and no breaking of existing content which
relies on the tilted capsule).
This commit straightens up the avatar capsule so it behaves consistently
(e.g. same collision behavior against prims regardless of which direction
the avatar is coming from; ability to fit through narrow doorways).
Please note this introduces other side effects which have not been fixed.
In particular:
* The avatar frequently falls through the terrain if it is not flat, though
the avatar behaves pretty well on flat terrain. This requires investigation
of the ode terrain collider.
* The apparent foot position of the avatar with respect to the ground
is changed. This requires investigation of the avatar height/capsule height.
Please consider this as work in progress.
2009-07-08 01:41:05 +00:00
652bcf91d5
- fixes a "collection out of sync" exception in the ODE physics
...
engine, caused by an "avatar infinite position" occurring under
heavy load.
- fixes "value too small" exception in ChatModule
2009-06-25 07:39:48 +00:00
034de5ecd6
Properly reset a vehicle's status to VEHICLE_TYPE_NONE when requested
2009-06-19 22:32:02 +00:00
8045ed28ec
From: Alan Webb <alan_webb@us.ibm.com>
...
Eat collision errors --- NOTE: this fix might be naive, it seems to
have helped us getting to 81 avatars (whereas we'd crash with 20
before), but it sure would benefit from some check-over by a person
skilled in the art of ODE physics.
2009-06-10 11:48:13 +00:00
a23d64dec1
Formatting cleanup.
2009-06-10 04:28:56 +00:00
f94e192b86
some code cleanup
...
test commit with cygwin svn
2009-06-06 08:41:27 +00:00
1e3f378c57
Fix comparison of UUID with null.
2009-06-04 01:26:31 +00:00
6f37fd8399
* Pried apart the ODE tests. This fixes mantis #3212
2009-06-02 18:12:34 +00:00
840de6c036
Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.
2009-06-01 06:37:14 +00:00
be41a2cb7e
reduce verbosity of sculpt map cache messages to reporting cache failures only
2009-05-31 23:57:52 +00:00
179724b4fc
some clean up of sculpt map caching code
...
remove a redundant debug message
2009-05-29 08:57:10 +00:00
05cbf0b502
reinstate a hopefully more robust experimental decoded sculpt map caching scheme
2009-05-29 06:50:15 +00:00
1609e7eac0
disable sculpt map caching until a better method of avoiding asset requests can be found
2009-05-29 05:11:50 +00:00
db4f8d1298
Experimental decoded sculpt map caching
2009-05-29 02:46:35 +00:00
85e91ddb67
Revert "* Added IntegrationTest Attribute and tagged the ODETestClass"
...
This reverts commit 8f0096cc7b112fea8f69f391224911f624482747.
To get us back to compiling on fresh checkouts.
2009-05-27 12:53:29 +00:00
17f0a4be53
* Added IntegrationTest Attribute and tagged the ODETestClass
2009-05-27 12:36:58 +00:00
ba360ede8b
* Upped version number to 0.6.5
2009-05-25 11:43:56 +00:00
1d02636c27
cleaning out warnings.
...
NOTE: we currently have a gazillion warnings caused stuff flagged as
"obsolete" (OGS1 stuff) --- what's up with that?
2009-05-22 14:57:00 +00:00
87b95e324e
Sculpt mesher refactor
...
adds some previously missing geometry to sculpties
new LOD improves vertex accuracy
fix torus mode mesh edge joining
sync with primmesher r37
2009-05-19 10:09:33 +00:00
14c1e991c6
some sculpted prim geometry accuracy and meshing speed improvements
2009-05-15 03:14:04 +00:00
bd3a4e5f01
Added a Copy() method to PrimMesh and SculptMesh as suggested by dmiles. Sync PrimMesher.cs and SculptMesh.cs with PrimMesher.dll r36.
2009-05-08 03:04:45 +00:00
09522743cb
alter behavior of sculpted prim "Inside out" setting. Addresses Mantis #3514
2009-05-03 06:25:52 +00:00
6f3437b77e
some code cleanup
...
sync with primmesher r35
2009-04-24 19:43:15 +00:00
9c13a93583
Limit hollow size of physics proxy to 95%
2009-04-24 19:28:29 +00:00
c5a3ff231f
* It turns out vehicle Angular Motor direction is always in global space.
2009-04-20 17:46:37 +00:00
b98f93212b
* Prevent a vehicle crash
2009-04-20 06:56:53 +00:00
21d4423030
* Allow passing of material type to physics engine
...
* Define low friction and medium bounce for Glass
2009-04-20 03:07:53 +00:00
716e1fe0e1
Keep IsColliding updated for the recent changes in ScenePresence so that walk/stand animations will get used instead of just falling
2009-04-19 12:28:29 +00:00
03901c8c0d
* Rudimentary angular motor implementation for the LSL Vehicle API
2009-04-19 08:12:10 +00:00
5f1fa0d3d7
Added a "force_simple_prim_meshing" option to the ODE settings in OpenSim.ini which will use meshes for collisions with simple prim shapes rather than internal ODE algorithms. This may help with Mantis #2905 and Mantis #3487 for those experimenting with capsule settings.
...
Note that this will increase memory usage and region startup time.
2009-04-19 01:21:38 +00:00
15b9c528c5
Add some documentation. (note this is *not* a thinly veiled attempt to increase my commit frequency *wink*)
2009-04-18 17:15:56 +00:00
68190617b4
* A few fixes to the Linear Motor
2009-04-17 23:04:33 +00:00
07c113a766
* Add Implementation of Linear Motor and Linear friction from the LSL Vehicle API in Physics
2009-04-17 21:10:54 +00:00
e95fe66dd5
* Set some minimum values to avoid divide by zero errors.
2009-04-17 04:38:31 +00:00
0d00a767bc
* Commit a few fixes to the Vehicle settings
...
* Vertical Attractor servo
2009-04-17 04:34:52 +00:00
8a7a0190e6
* Remove some super experimental stuff in BulletDotNETPlugin since it was causing issues.
...
* Tweak the ODEPrim PID a bit more.
2009-04-16 08:11:05 +00:00
eac5d4015d
* Committing more BulletDotNETPlugin work
...
* Tweak the LLSetStatus results in the ODEPlugin. Hopefully it's a little less unstable.
* ODEPlugin is using experimental math for LLSetStatus, use with caution! :)
2009-04-16 07:31:48 +00:00
d34d5eb3f7
* Adding some organization of vehicle type stuff in the ODEPlugin.
...
* Vehicles do NOT work. This is just organization and a bit of logical code to make doing vehicles easier
2009-04-14 09:03:18 +00:00
c2e75aecd1
* Commit a variety of fixes to bugs discovered while trying to fix the NaN singularity.
...
* WebStatsModule doesn't crash on restart. GodsModule doesn't crash when there is no Dialog Module. LLUDPServer doesn't crash when the Operation was Aborted.
* ODEPlugin does 'Almost NaN' sanity checks.
* ODEPlugin sacrifices NaN avatars to the NaN black hole to appease it and keep it from sucking the rest of the world in.
2009-04-14 01:57:35 +00:00
2dca78b2bf
* BulletDotNETPlugin supports Axis lock (LLSetStatus) from the script engine now.
2009-04-11 03:04:08 +00:00
53026affb3
* Instead of referencing mesh stuff in the physics plugin.. change the IMesh Interface. (blame prebuild)
2009-04-11 00:11:54 +00:00
474b982eba
* Adds Physical/Active Linkset support to BulletDotNETPlugin
2009-04-10 23:26:42 +00:00
10f5615573
* Tweak the character controller some more
...
* Add cursory integration with script engine.
* LLMoveToTarget, LLSetBouyancy, LLSetStatus (Physical only), LLApplyImpulse, LLApplyTorque, LLPushObject.. etc.
* Still missing linked physical active and LLSetStatus with an axis lock.
2009-04-10 06:01:29 +00:00
b05a1aa4b7
* Whoops, never saved the BulletDotNETScene.. Last commit continued.....
2009-04-09 22:00:15 +00:00
4050dec682
* Changes the timstep of the bullet world
...
* Enables border crossings when using the BulletDotNETPlugin
* Enabled variable time steps in BulletDotNETPlugin
* Still no 'linked physical objects' yet
* Still no script engine integration
2009-04-09 21:48:11 +00:00
b326b55bcd
* Added finite testing to the character and object constructor
2009-04-07 16:41:07 +00:00
9bbc7e8bf6
* Added a routine to check if a PhysicsVector and Quaternion is finite
...
* Now validating input to the Physics scene and warning when something is awry.
* This should help nail down that Non Finite Avatar Position Detected issue.
2009-04-07 16:13:17 +00:00
11f8ea30f9
* Tweak the BulletDotNETPlugin character controller so it feels more finished.
2009-04-07 15:01:46 +00:00
0d4880d5cf
* This fixes BulletDotNET so it can now be used on linux.
2009-04-07 03:33:28 +00:00
9459b16cc2
* BulletDotNET Updates.
...
* Should react somewhat normally to editing, and setting physics now.
2009-04-07 00:13:08 +00:00
465f1df592
Add copyright headers, formatting cleanup.
2009-04-06 14:36:44 +00:00
f73d4f9735
unspecified sculpt stitching mode now defaults to plane instead of sphere. Addresses Mantis #3403
2009-04-05 19:25:39 +00:00
cf1e8b1723
* Fixing SVN properties
2009-04-05 08:43:29 +00:00
e592d03843
* Committing what I have on the BulletDotNETPlugin that I have so far.
...
* It's not ready to try. It doesn't do what you expect in many ways.
* It throws errors and prints jibberish on the console
* Test it out only if you're brave and you've backed up first.
* The opensim.ini line is physics = BulletDotNETPlugin
2009-04-05 08:35:38 +00:00
5f4cab6ed3
fix an error in hollow cylinder face number calculation
2009-04-03 08:45:32 +00:00
b42fec5c74
partial support for sculpted prim "inside out" setting
2009-04-02 06:54:48 +00:00
958d764172
* Upped trunk version number to 0.6.4 as we just tagged 0.6.4-release
2009-04-01 19:44:46 +00:00
8493123629
Hard code scaled image resolution to 96 dpi prior to sculpt meshing to prevent a mono 2.4 failure. Thanks to cmickeyb for pointing out the failure.
2009-04-01 18:38:51 +00:00
aecb4fb72a
From: Alan M Webb <alan_webb@us.ibm.com>
...
Add sanity check to fly-height calculation so that it does
not attempt to retrieve information from non-existent
regions.
2009-03-31 12:45:34 +00:00
0318e824ae
* Remove a debug line of localIDs
2009-03-30 14:13:56 +00:00
6522b4f5d4
* Fixing thread safety of avatar adding and removing from the Physics Scene in the ODEPlugin
...
* This may help one of the symptoms or mantis 3363 , however it probably won't solve the occasional NonFinite Avatar Position detected.. issues that some people see. That is probably an entirely different issue(NaN).
2009-03-30 14:10:24 +00:00
ad012d4b46
add x-axis mirror capability to sculpted prim mesh - addresses Mantis #3342
2009-03-26 18:12:10 +00:00
3bedb59f50
make some arrays static to prevent excessive re-initialization - suggested by jhurliman
2009-03-26 03:10:30 +00:00
aab38c2cb2
Ensure the remembered velocity is zero when physical is turned off on a prim. Without this the velocity gets sent to the client and the prim appears to move.
...
Fixes Mantis #3303
2009-03-20 15:59:11 +00:00
fa5fef33a9
fixed propagation of normalized sculpt mesh vertex normals
2009-03-15 09:05:35 +00:00
acad0328b2
* Make all coded defaults match settings in OpenSim.ini.example
...
* In most cases, the setting in OpenSim.ini.example is taken as the canonical one since this is the file virtually everyone ends up using
* OpenSim will start up with a blank OpenSim.ini, in which case sqlite is the default database (as before)
2009-03-11 18:02:22 +00:00
f9ebdee1d2
* Tweak llMoveToTarget per mantis 3265
...
* Add some comments to the Wind Module
* Add the BinBVH decoder/encoder as a scene object (to encode/decode animations programmatically).
* Add m_sitState for upcoming code to improve sit results.
2009-03-09 04:33:53 +00:00
385d3a467c
Minor formatting cleanup.
2009-03-07 16:16:00 +00:00
93a697b24d
Correct a typo, purely cosmetic.
...
FixesMantis #3263
2009-03-07 14:39:42 +00:00
5a49c772ca
* Making the minimum ground offset for flying a configurable offset in the OpenSim.ini. This is the code that causes you to rise off the ground when you press the fly button and attempts to keep you above ground automatically when flying in a simulator.
...
* minimum_ground_flight_offset, by default is 3 meters, as per Kitto Flora See OpenSim.ini.example for an example.
2009-03-07 07:17:43 +00:00
6c7151109b
* fixes mantis 3259
...
* I'm concerned however that the 'minimum fly height' should really be implemented in ScenePresence and not in the specific physics plugin so that all of the physics plugins can take advantage of it and if desired, a person could swap out the 'minimum fly height' functionality with other functionality.
2009-03-07 06:51:27 +00:00
3a93bb992f
* Added some limits to the maximum force applied per second by llMoveToTarget. Currently, it's 350 times the mass in newtons applied per second, maximum.
2009-03-07 00:27:56 +00:00
b637a11b58
Fixes Mantis #3260 . Thank you kindly, MCortez for a patch that:
...
llSetHoverHeight() should not clamp the x/y position of an object the way MoveTo does,
and it should recalculate the absolute height to hover at as an object moves to reflect
the current ground/water height under it.
Correctly implementing required adjusting the Physics interfaces and implementing at
the physics plug-in level. The attached is a patch that correctly implements
llSetHoverHeight() including updates to the ODE physics plug-in.
2009-03-06 23:01:35 +00:00
ac84d3d26b
* Fixing a few mass calculation errors suggested by jhurliman
2009-03-05 21:59:27 +00:00
36e648a37a
* minor: Remove most mono compiler warnings
2009-02-25 20:53:02 +00:00
8afad46d10
remove log4net dependency and from PrimMesher.cs
...
sync PrimMesher.cs with PrimMesher.dll version 29 on forge
2009-02-24 06:02:44 +00:00
8f55b9d735
Mantis#3218. Thank you kindly, TLaukkan (Tommil) for a patch that:
...
* Added log4net dependency to physxplugin in prebuild.xml.
* Added missing m_log fields to classes.
* Replaced Console.WriteLine with appropriate m_log.Xxxx
* Tested that nant test target runs succesfully.
* Tested that local opensim sandbox starts up without errors.
2009-02-22 20:52:55 +00:00
2e095f5727
* Upped VersionInfo to 0.6.3 and in the process, changed assemblyinfo to 0.6.3.* to better track down dll ref and overwrite problems.
2009-02-20 16:47:31 +00:00
5af465a364
* Changed all AssemblyInfo to explicit version 1.0.0.0 to not confuse poor poor Nant. We probably should take the opportunity to let the non-module bins reside in their /bin/Debug dirs later.
2009-02-19 14:51:33 +00:00
3d5a9e6748
This started as way to correct Mantis #3158 , which I believe should be fixed now. The flying status was temporarily being ignored, which caused the avie to drop sometimes -- there was a race condition. In the process it also fixes that annoying bug in basic physics where the avie would drop half-way to the ground upon region crossings (SetAppearance was missing). Additionally, a lot of child-agent-related code has been cleaned up; namely child agents are now consistently not added to physical scenes, and they also don't have appearances. All of that happens in MakeRoot, consistently.
2009-02-15 05:00:58 +00:00
7731c055e4
Set sculpt map alpha to 255 prior to scaling and meshing. Addresses Mantis #3150
2009-02-15 04:00:00 +00:00
95d53d48d4
Add copyright headers. Minor formatting cleanup. Fix some compiler warnings. Fix some m_log declarations.
2009-02-13 02:06:28 +00:00
d21601d497
Thanks Kitto Flora for a patch that adds automatic min fly height to ODE - Mantis #3134
2009-02-12 07:58:10 +00:00
c0c330988f
* Some minor cleanup
...
* sealed OdeScene
2009-02-08 17:41:15 +00:00
26ca3e26bf
Reverts patch from tuco/mikkopa/sempuki mantis #3072
2009-02-08 17:25:02 +00:00
b60931b686
* Limit the total number of joints created per frame to the maximum possible without causing a stack collision.
...
* This fixes crashing on large sets of physical prims because of stack collisions (assuming you follow the directions on linux for starting ode with ulimit). After the maximum joints are created, objects will start to fall through the ground and be disabled. Not the best solution, but it's better then a crash caused by a stack collision with the process exceeding the maximum available memory/recursions per thread.
* Make a clean region, make a stack of 5000 prim, 20 layers high. Make them physical, *SLOW*, but no crash.
2009-02-08 03:02:43 +00:00
08a9a85376
* Fixes colliding with the terrain lower then 0 and higher then 256m
...
* The actual AABB of the heightfield on the Z is now determined by the minimum and maximum heightfield value in the terrain array (assuming it's a reasonable number). This might optimize collisions in simulators that have a small difference between minimum and maximum heightfield values.
2009-02-08 01:05:09 +00:00
949ae6136e
Change access levels from private to protected to facilitate
...
subclassing; also add new method signatures. Thanks tuco and mikkopa.
Fix Mantis #3072 .
2009-02-03 08:31:08 +00:00
85c0c0557e
* Tweaks some locks when modifying an ODECharacter. This actually allows a user to log-in while the physics scene and the scripts are starting up. This also seems to smooth out the jerks on teleport/connect/disconnect a little bit.
...
* If you log-in while the simulator is starting up, you won't be able to move and the sim stats will say 0 FPS, and 0 Physics Frames and you may see only terrain. Once the sim finishes starting up, it'll all resume as normal.
2009-01-31 16:49:32 +00:00
1a55dd11f1
* More friendly OpenJpeg error handling.
...
* Often times now the only reason OpenJpeg doesn't work is because it requires Glibc 2.4 The error messages reflect that.
* In J2kDecoder module, It stops trying to decode modules if it encounters a dllnotfound exception and instead sends a full resolution layer that causes the texture sender to only send the full resolution image. (big decrease in texture download speed, but it's better then nasty repeating error messages)
2009-01-21 11:16:33 +00:00
032b30ffdb
Fix an error in sculpt LOD calculation
2009-01-21 02:40:09 +00:00
bfdf2479fb
Improve parsing of joint parameters for NINJA physics (Mantis #2966 ).
...
Multiple spaces or leading/trailing spaces when specifying the prims
to connect should no longer cause problems.
2009-01-14 04:59:57 +00:00
20670ff0c8
sync with primmesher r26 on forge
2009-01-04 19:09:31 +00:00
f836e36c49
Improve LOD scaling for anisotropic sculpted prim meshes
2009-01-04 18:36:13 +00:00
a72d3522ff
Slight optimisation: Don't check for duplication if we won't use the result anyway.
2008-12-31 20:09:17 +00:00
4b760bba79
- Added the fixed Ode.NET.dll
...
- Adapted code to match the corrected signatures
- Fixes Mantis #2934 . Hopefully.
Note: Physics on linked objects still don't work correctly:
It doesn't crash the region anymore, but the example object in
the mentioned mantis now falls through the ground.
2008-12-31 19:35:46 +00:00
067a9f3d5f
Added a missing setMass for initializing the mass of prims
2008-12-31 19:35:33 +00:00
e4c7bdc730
* Remove mono compiler warnings
...
* Leaving the 23 warnings in ChildAgentDataUpdate.cs for Diva to look at
2008-12-30 20:48:31 +00:00
2be0f7a6f0
Update svn properties, minor formatting cleanup.
2008-12-30 01:08:07 +00:00
6eed7fcd1e
* More NINJA Joint physics fixes from nlin.
...
fixes mantis #2874
2008-12-28 16:30:00 +00:00
b378bd33ad
* Fixes mantis #2922
...
* Converts some C# 3.0 syntax into it's 2.0 equivalent so that Visual Studio 2005 can compile it successfully.
2008-12-27 00:17:08 +00:00
ec2dc354b4
* Applying Nlin's NINJA Joint patch. v2. Mantis# 2874
...
* Thanks nlin!
* To try it out, set ninja joints active in the ODEPhysicsSettings
and use the example at:
* http://forge.opensimulator.org/gf/download/frsrelease/142/304/demo-playground.tgz .
* Don't forget to change the .tgz to .oar and load it with load-oar.
2008-12-26 12:58:02 +00:00
8a86439985
Removed some debugging code that was inadvertently left in in my last commit :/
2008-12-22 07:25:41 +00:00
c66cfb51f7
Fix a floating point comparison that was causing some misshaped triangles on some prim faces
2008-12-22 06:07:51 +00:00
62dd67b8b8
Mantis#2796. Thank you kindly, Gerhard for a patch that addresses:
...
On a call of llVolumeDetect(1) (or any other number !=0) volume
detection is enabled. Together with VD, the phantom flag is set to the GUI.
On a call of llVolumeDetect(0), vd detection is switched of again,
also the phantom state is removed. On a call to llSetState(STATE_PHANTOM,
false) while VD is active, also VD is switched off. The same is true for
unchecking the phantom flag via GUI. This allows to take back VD without
the need to script just by removing the phantom flag.
Things missing in this patch: persistance of the volume-detection flag.
This needs more discussion and will be included in another patch soon.
2008-12-20 21:36:42 +00:00
2537a4098a
Enabled complex meshing for simple box prims with non-zero shear
2008-12-18 17:53:38 +00:00
ff7c8551ba
* remove mono compiler warnings
...
* should work - the last compile failure looks like a random glitch...
2008-12-17 18:42:23 +00:00
3b0db66b92
* Apply http://opensimulator.org/mantis/view.php?id=2775 with small tweaks
...
* This pushes an identifier for the OpenSim scene to the physics scene. This allows log messages from the physics scene to identify which OpenSim scene they relate to.
* Thanks Gerhard
2008-12-15 18:39:54 +00:00
8ad6f575eb
* Implements the torque/Rotational Impulse methods in the PhysicsAPI and the ODEPlugin and pipes them to their respective LSL method.
...
* NBody will need to be updated, this is an API change. Torque property and AddAngularForce
2008-12-14 14:30:28 +00:00
b5dec9a37f
* Added Avatar minimum size in the ODEPlugin and a stern warning about setting the capsule size too low in OpenSim.ini
2008-12-14 07:29:40 +00:00
6f7a560c04
* A Few physical prim + linkset fixes. Prevent some crashes
2008-12-14 06:34:05 +00:00
7f80eff067
* Committing a slightly distilled version of nlin's ODECharacter race condition eliminator.
...
* The modifications that I made were only so that it didn't require changes to the public physics api.
2008-12-10 23:46:20 +00:00
cb73cf1a92
* Fixes a few instances of llSetStatus with Axis lock gone wrong.
...
* Sums up the masses of the objects within a physical linkset
2008-12-09 16:27:07 +00:00
3ba0bc8f44
Minor formatting cleanup.
2008-12-09 12:15:02 +00:00
3844e73d27
* Gerhard's patch m2781. Does some initial work for setting up llVolumeDetect.
...
* Warning! Physics API change. This means that the NBodySimulation needs to be updated!
* PhysicsActor -> void SetVolumeDetect(int) needs to go into classes that use PhysicsActor as their base class.
2008-12-09 11:11:16 +00:00
44d133da66
clean up some old debugging code
2008-12-09 08:17:31 +00:00
e61dacb928
* Adds some rudimentary error handling to the physics debug drawstuff tool.
2008-12-08 07:19:26 +00:00
76e1462dff
* Tweaks physics so that linked prim are a single body. This will make linked prim more stable and probably the last obstacle to vehicles physics wise.
...
* Fixed a bug that caused physics proxies to be scattered when you link an object.
* Single physical prim work exactly the same as before, just linked physical prim will have changed.
2008-12-07 04:03:09 +00:00
bdffd56a45
killing warnings, reformatting RemoteAdminPlugin
2008-12-05 15:28:03 +00:00
b4db3a550a
* Apply http://opensimulator.org/mantis/view.php?id=2750 with a small tweak.
...
* Initializes ODE only when a scene is grabbed rather than on plugin load. This means we don't initialize ode if that physics engine is not used, and it allows other ode use
plugins to be used instead.
2008-12-04 20:29:34 +00:00
d324389dd9
Update svn properties.
2008-12-03 04:41:31 +00:00
098f16fe31
Remove duplicated avatar height calculation in lsl functions.
...
Use height calculation in Basic Physics and Physics of Simplicity so that avatars larger than the default walk with straight legs and shorter walk on the ground.
2008-12-01 00:49:36 +00:00
07ee2c3504
Revert r7548 and r7549 until someone with prebuild-fu can help structure the dependencies
2008-11-30 03:52:18 +00:00
37afd69feb
Removed remaining meshing code
...
Add PrimMesher.dll r21
All meshing tasks are now passed through Meshmerizer and handled by PrimMesher.dll
2008-11-30 03:13:02 +00:00
fdd2388331
Update meshing code to sync with current PrimMesher.cs on forge.
...
Migrate sculpt meshing code to primMesher version. This should result in more accurate physical sculpted prim proxies.
Remove much obsolete code from Region/Physics/Meshing
2008-11-29 11:02:14 +00:00
b9c07730f5
* refactor: change some method names and doc in the physics plugin manager
...
* move the directory choice for plugins outside into RegionApplicationBase
2008-11-20 19:52:55 +00:00
d625095959
* Allow physics dlls to be loaded separately, rather than just the contents of bin/Physics
...
* This is primarily to see if not loading ODE in the unit tests will allow them to proceed, though the option of separate loading is probably a good thing in itself
2008-11-20 18:28:30 +00:00
81dcf223bf
* Add enough infrastructure code to run an extremely basic and flaky add root agent scene test
2008-11-20 16:58:40 +00:00
6f0e068cf1
Guard against a strange nullref in ODE
2008-11-19 20:04:41 +00:00
a3f785e978
Changed sculpted prim texture scaling method to bilinear to reduce scaling artifacts
2008-11-16 00:24:10 +00:00
a760586f26
* minor: remove mono compiler warnings
2008-11-14 20:15:22 +00:00
cec112c87a
* refactor: as per a recent opensim-dev thread, rename InnerScene to SceneGraph to make it more descriptive of its intended function
2008-11-12 20:16:46 +00:00
ce37b80c68
Thank you, idb, for a patch that fixes avatar height calculation
...
Our feet will now be above ground
2008-11-10 01:28:37 +00:00
087d2f9147
Enabled SoftERP for the contact structure but not SoftCFM.
...
A tube on a pole is a bit less "flubbery" so maybe this is
the right direction.
2008-11-09 20:20:20 +00:00
c6ed72b4fa
Clean up a few comments.
2008-11-09 18:43:46 +00:00
8ed4821c47
Clean up the mass < 0 logic a tiny bit when
...
calculating mass.
2008-11-09 18:22:36 +00:00
c6dad833f5
* minor: remove some mono compiler warnings
2008-11-06 21:01:16 +00:00
9770cf778e
* minor: Make some 'startup config failed to load' log messages more consistent
2008-11-06 20:38:04 +00:00
5fffc04ae6
Add more vertex normals and UV coordinates. Sync with primmesher.dll forge project.
2008-11-05 10:22:41 +00:00
9299be0080
Revert last checkin. Avatars fall through non-physical prims now.
...
There is more to the solution then just enabling soft_erp and
soft_cfm for all d.Contact cases.
2008-11-01 17:58:34 +00:00
1e376deedd
Added soft_cfm and soft_erp to the general "contact" initialization
...
for physical prim interactions. They were not previously enabled
for prim-prim interactions.
2008-11-01 17:30:06 +00:00
5cf6a7f118
Viewer side normals and UV fixes on profile cuts. Sync with primmesher.dll forge project.
2008-10-29 09:47:45 +00:00
7beeaf51f8
* minor: remove mono compiler warnings
2008-10-28 21:47:43 +00:00
ae5d92a167
some sorely needed extruder code simplification and refactoring, also some fixes to cut face UV coordinates
2008-10-28 08:57:15 +00:00
754f6ba2a2
* minor: remove mono compiler warnings
2008-10-27 20:16:42 +00:00
3447bed8be
Add end faces when radius setting is non-zero
2008-10-24 23:37:09 +00:00
c519b80680
* minor: eliminate some mono compiler warnings
2008-10-24 21:40:05 +00:00
71660003de
un-double-flipped some double-flipped normals in circular path prim end caps
2008-10-24 20:04:34 +00:00
a11fa9055a
Fixed a floating point error accumulation that was causing missing end faces on some twisted prims
2008-10-24 05:31:43 +00:00
dfc12d591c
* Add a config option for filtering collisions. Sometimes, under load, this seems to cause bouncing on really thin flat prim.
2008-10-22 01:52:12 +00:00
931b04485d
More work in vertex normals and texture UVs. Syncing code with pyov.
2008-10-21 01:35:05 +00:00
923f9fb749
* minor: remove mono warnings
2008-10-19 18:45:41 +00:00
b6396bc9a7
More progress towards implementing vertex normals - not complete yet.
2008-10-19 09:04:25 +00:00
11fd935038
* Changed the dupe collision depth limiter to be slightly more restrictive. (less chance for a dupe)
2008-10-18 16:20:02 +00:00
0916b38b83
* Fix an over compensation for bounciness on flat Primitive
...
* Implement the linear impulse portion of llPushObject. We should have a lsl compatible implementation of that portion of the push. Angular.. well. still have yet to implement a torque accumulator.
* llPushObject respects the region and parcel settings for Restrict Push, it also respects GodMode as is defined in the LSL spec.
2008-10-17 23:19:00 +00:00
a6df2011f7
* Adds a lot of stability and performance to the physics engine. The avatar bounces less and things are a bit less explosive.
...
* Additionally, you can probably get more physical prim now together.. though, I think this puts us back on par with where we were in the beginning of the year on number of physical objects. Experiment. Make videos. Send Feedback. Enjoy.
2008-10-17 05:09:23 +00:00
82b7374ed2
* minor: get rid of pointless ipeSender
2008-10-16 19:50:12 +00:00
4df08aed30
* Apply http://opensimulator.org/mantis/view.php?id=2401
...
* Removes spacers that are also separators in llParseString2List
* Thanks idb
2008-10-16 17:14:02 +00:00
68d85497ad
* Releases the inter-region thread synchronization between physics in ODE on the same instance.
...
* If you are hosting many regions on a single instance, you will probably notice a decrease in region startup time and maybe a slight increase in performance.
* Single regions won't notice anything different
2008-10-16 12:57:29 +00:00
98245e4bfa
* minor: Oh go on, one more warning. Oooh, you are naughty
2008-10-15 20:46:39 +00:00
b1248004f0
* minor: remove some warnings
2008-10-15 17:19:02 +00:00
180e3de50f
* Cleaned up tons of code duplication in ODEPrim
...
* Re-enabled the native ODE prim types when possible
* Fixed several invalid assumptions in the prim recycle process.
* Added better message for 'reused a disposed physicsactor'
* Added a way to recover from errors during collision_optimized
* Added a way to recover from an error condition where prim_geom wasn't reset properly
2008-10-14 02:48:30 +00:00
138a3924e0
Committing more work towards implementing vertex normals. Also added some (hopefully) helpful messages for identifying corrupt prims and some fixup code for corrupt profile cut data.
2008-10-13 22:52:39 +00:00
f344f26bd8
* Based on user reports, it looks like the OS specific settings have been unified as far as tuning (thank heavens).
...
* If you're experiencing knee bendiness try the windows settings, as the *nix settings seem to now be incorrect. (this update does that, but you may have your own opensim.ini settings active.
2008-10-13 01:54:13 +00:00
2ede1a3ce7
* This updates ODE to the most up-to-date version as of today. 1558
...
* Mac users, pray to chi11ken to make you a .dylib version
* This is semi-tuned and post teravus hack. (Though I didn't apply the terrain pitting fix hack. I'm still deciding if it's necessary as there was a lot of work over the past several months on the heightfield collider.
* Please use '--enable-shared --disable-demos --disable-asserts' if you are building your own libode in the configure step. Asserts are pretty much useless for use with .NET
* This also updates ODE.NET as, there were some API changes in May that were just added to ODE.NET today.
2008-10-12 23:47:39 +00:00
f2700590d7
removed some more extraneous hidden faces
2008-10-12 09:36:01 +00:00
116a08f42e
Fixed a missing face on a profile cut
2008-10-12 08:52:42 +00:00
216787ee1d
Optimization: calculation of profile vertex normals is now disabled as default.
2008-10-12 07:04:52 +00:00
09c8713801
Eliminate some unnecessary polygons
2008-10-11 00:30:27 +00:00
dd886a035b
* minor: remove warnings
2008-10-10 21:05:44 +00:00
62f3e11b4e
Some more decrufting
2008-10-10 09:16:36 +00:00
726e0045d9
Some decrufting
2008-10-10 09:00:52 +00:00
7fbe942792
refactoring PrimMesher to add viewer compatable features and some code cleanup
2008-10-10 08:22:13 +00:00
979a354ba0
Cap proxy mesh scale minimum to 0.01 meter for X, Y, and Z terms.
2008-10-04 17:39:03 +00:00
cf9835130a
Square hollow size in cylinder meshes were a little too small - fixed.
2008-10-02 02:33:45 +00:00
6758ecc403
Implement the plumbing for llSetVehicleType from the LSL
...
subroutine down through the physics modules through PhysActor
and SceneObjectPart. No connection to the physics simulators.
2008-09-28 22:38:59 +00:00
ebbbd37605
Added the plumbing for llSetVehicleRotationParam
...
in the classes between the LSL implementation and the
underlying physics engines.
2008-09-28 21:53:56 +00:00
3747862999
Plumb the connection though from llSetVehicleVectorParam
...
to the various physics engines. No connection to the
underlying physics simulator yet, just plumbing through
the various classes.
2008-09-28 20:20:32 +00:00
3397236c6c
Plumb the connection through from llSetVehicleFloatParam
...
to the various physics engines. No connection to the
underlying physics simulator yet, just plumbing through
the various classes.
2008-09-28 18:36:30 +00:00
232aa783ad
Disabled use of ODE internal geometry to see if it affects the "waves finger" error
2008-09-22 02:33:48 +00:00
52af9b3fd7
ODE was using a box collision shape for some spheres - changed those cases to now use a mesh instead.
2008-09-21 08:12:52 +00:00
c8349e21c4
Update svn properties, minor formatting cleanup.
2008-09-21 02:41:22 +00:00
e6afb28355
re-enabled some ODE internal proxies for some simple prim types to try to save some more memory
2008-09-19 09:13:27 +00:00
8ff1bc5b03
* Make the ode simulation update loop print out the stack if an exception occurs (at least, this is what will happen on linux)
2008-09-18 18:54:42 +00:00
903fbd1f06
XEngine: fix collisions, add event coalescing for collision events.
...
Fix a nasty concurrency issue that could cause a high event frequency
to start more than one thread pool job for a single script.
2008-09-18 18:50:39 +00:00
b4141f9e56
Formatting cleanup.
2008-09-13 22:07:07 +00:00
8a8b01d1b8
Circular path prim meshes are now joined where the path ends meet if they match. This may have a minor improvement in memory and speed performance, but it's mainly for viewer applications and it also syncs the c# version of PrimMesher with my python sandbox version.
2008-09-13 10:22:17 +00:00
0dc1018ca1
* minor: Remove warnings
...
* leaving in the ones to do with ScriptBase since these actually indicate coding bugs that I don't have the time/brainpower to fix at the moment
2008-09-12 21:20:24 +00:00
febb781779
remove hidden faces inside prim meshes to improve memory use and startup time
2008-09-12 19:42:26 +00:00
fae34bb10c
Update svn properties, formatting cleanup.
2008-09-09 01:26:48 +00:00
7d89e12293
* This is the fabled LibOMV update with all of the libOMV types from JHurliman
...
* This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle.
* This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big!
* Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
2008-09-06 07:52:41 +00:00
0fc618e7b2
Replaced a lot of trig calls with lookup tables for common prim types in an attempt to improve meshing speed.
...
Added a new between points interpolation method to improve accuracy of profile cuts in triangle and square profile prims.
2008-09-05 16:38:51 +00:00
109aa00150
fix: PostInitialise() not being called on script engines (nasty one that)
...
cleanup: warnings, readability
2008-09-02 12:07:23 +00:00
a5e7807612
Y top shear accuracy improvements in circular path prim meshes
2008-09-02 01:54:08 +00:00
f4035840d2
compensates profile placement effects of Y hole size on X top shear for circular path prim meshes
2008-09-01 08:19:47 +00:00
9cf9c08696
Improvement in mesh accuracy in X Top Shear parameter for circular path prims
2008-09-01 06:00:07 +00:00
49ec6dd882
* squash some obvious warnings
...
* a couple more remain that preferably the original coders should look at in more detail (obsolete warnings in the ogp module and not overriding warnings in the script
engine)
2008-08-30 18:09:38 +00:00
35ad484b6b
fixed some ugliness in the conversion from the new mesher format to the old that should speed up region startup a little and maybe even use less memory if the GC decides to play friendly with the other kids.
2008-08-29 08:19:47 +00:00
3bf8858727
Update svn properties, formatting cleanup.
2008-08-28 14:41:54 +00:00
49f9bd8b68
Added some exceptions for bad profile cut parameters
2008-08-28 06:41:32 +00:00
1a83384f90
re-enable new PrimMesher module for mesh creation for standard (non-flexy) prims.
2008-08-27 23:43:53 +00:00
2c842652c1
ODEPlugin now frees source mesh data after conversion to pinned lists to save memory
2008-08-27 23:39:50 +00:00
e593a333c7
adds releaseSourceMeshData() method to IMesh and Mesh for freeing mesh data after conversion to pinned lists.
2008-08-27 23:37:14 +00:00
36d1720fde
reverting to prior meshing methods until some physics timing issues can be resolved
2008-08-27 09:49:13 +00:00
65c82c2494
Added some exception trapping to PrimMesher
2008-08-27 08:03:52 +00:00
cf951d4d04
Added some exception handling to help catch some possibly corrupt prims
2008-08-27 07:30:14 +00:00
3481a977f0
Meshmerizer now uses new PrimMesher class for meshing all standard (non-sculpty) prims. This should result in more accurate meshes, lower memory consumption, and eliminate several lockup modes.
2008-08-27 06:53:09 +00:00
8be249bc68
Completion of new PrimMesher class
2008-08-27 06:39:39 +00:00
fce83731ad
Modified Mesh object to allow alternative mesher interfacing
2008-08-27 06:29:34 +00:00
29407a43f5
more progress on new meshing routines
2008-08-24 01:23:04 +00:00
72f74acdbf
more work on new meshing routines...
2008-08-23 10:28:35 +00:00
df14889635
some initial work on new prim meshing routines (incomplete)
2008-08-23 08:33:00 +00:00
0f6b899ec7
Cleaned up some warnings
2008-08-22 07:25:53 +00:00
261876fd47
Commented out the float array "normals" in the Mesh object and all references to save memory as it was unused
2008-08-22 07:06:33 +00:00
6ef9d4da90
Formatting cleanup.
2008-08-18 00:39:10 +00:00
1bf60fa1ac
updated some prim parameters to project maintained versions
2008-08-14 08:59:13 +00:00
88fba448a1
reinstates torus profile zflip which was mistakenly removed in patch 1870
2008-08-01 05:48:24 +00:00
1d3677eb9b
Thank you jhurliman for a meshmerizer patch that replaces the quaternion->matrix->vertex*matrix->vertex code with a direct transformation.
2008-08-01 05:45:58 +00:00
3035f5cb64
Re-enables testing for config option mesh_sculpted_prim which was inadvertently disabled in a prior modification (oops) :)
2008-07-25 20:29:37 +00:00
1e7c9e4810
* Fix the ODEPlugin unit test
2008-07-25 05:23:10 +00:00
c67198299e
Changed application of constant forces to after PID force is applied. llSetForce() should behave identical to the Linden implementation now.
2008-07-24 21:05:30 +00:00
f74a9bcdc7
Implements llSetForce() and llGetForce(). These are experimental and the units may not match the Linden implementation.
2008-07-24 07:45:58 +00:00
492b25362c
Clean up Meshmerizer.cs a bit to make it more readable
2008-07-21 23:08:23 +00:00
49adb6e09f
refactor - commenting out needsMeshing() and all references as createMesh() has the same logic and obsoletes the need for it.
2008-07-18 00:03:28 +00:00
13399ff439
Passes prim physical status to mesher from physics plugins
...
Small prims now get a full mesh if they are physical
Fixed a logic bug that was preventing many prim meshes from having excess memory cleaned up
Switched to more conservative method of vertex and triangle list trimming to prevent possible crash
2008-07-12 01:58:20 +00:00
f6c7f167b9
Overloads CreateMesh method of interface IMesher to pass prim physical status to mesher
2008-07-12 01:02:41 +00:00
b42770bf7a
Trim out nulls from mesh vertex and triangle lists to try and save more memory
2008-07-11 20:32:58 +00:00
3646cc32c4
Experimental physics optimization: prims with all 3 dimensions less than 0.2 meters will be meshed as a simple box
2008-07-11 17:22:37 +00:00
c5333af7a2
added a hollow size constraint to box, cylinder, and prism prim meshes to prevent a possible sim lockup
2008-07-07 10:09:35 +00:00
56c6bdcb26
Addresses more problem box cut angles
2008-07-07 05:42:37 +00:00
063365c0dc
fix some Meshmerizer problem angles for sphere dimple and box path cut
2008-07-07 04:32:05 +00:00
6914fb6f13
disables changes in r5356 until I have more time to do further characterization
2008-07-06 19:44:59 +00:00
ae468bfc9b
Corrects errors in sphere mesh with dimple start angle > 0 and hollow == 0
2008-07-06 17:18:59 +00:00
fd69251bcd
alters a problem path cut angle for the cylinder prim profile
2008-07-06 02:04:24 +00:00
13d6615263
Adds experimental Meshmerizer support for "prim torture" effects of sphere dimple on prim types box, cylinder, and prism
2008-07-02 17:08:52 +00:00
313f7f60fd
properly explaining each #pragma warning disable
...
massaging OSHttpRequestPump to not abort on exceptions...
2008-06-30 11:57:47 +00:00
b0287a43bd
disables spam-like debugging messages inadvertently left on in last commit (oops)
2008-06-30 06:11:43 +00:00
7077cffe52
Corrects Meshmerizer orientation of profile cut angles for ring type prim
2008-06-30 06:08:43 +00:00
a944ef4947
Corrects meshmerizer profile cut angle orientation for tube type prims
2008-06-30 02:08:27 +00:00
0260b33517
Altered prim description/debugging message code to be more warning friendly
2008-06-28 18:04:04 +00:00
c06dbf4fe5
Mantis#1620. Applied Melanie's patch
2008-06-28 16:13:11 +00:00
8b8b45267e
altered prior warning fix to Meshmerizer.cs to allow mesh debugging code to function
2008-06-28 00:16:41 +00:00
748f72326d
last round of warning squashing. calling it a day now.
2008-06-27 23:03:39 +00:00
7d55dfba8a
dr scofield's warnings safari:
...
* commenting out unused variables
2008-06-27 17:25:03 +00:00
76e24d02ad
Minor refactoring of POS. Adds a Util.Clamp(x, min, max) function.
2008-06-26 02:03:40 +00:00
e75dc1bd23
Separate POS classes into mutiple files.
2008-06-26 00:30:33 +00:00
a2b1a1787d
Minor formatting cleanup.
2008-06-25 14:30:28 +00:00
80f5eb21ea
More svn properties. Minor cleanup in POS.
2008-06-25 13:32:27 +00:00
bc66a851d6
Modifies box prim profile cut parameters to avoid angles which cause spurious triangles in mesh
2008-06-25 07:17:36 +00:00
7b4991430b
Changes selection criteria to allow meshing of more sphere prim configurations.
...
Adds comments to some functions in Meshmerizer.cs.
2008-06-21 08:50:56 +00:00
e02a2e31e0
* Patch from nlin to enable DIF state file writing from the ODEPlugin
...
* Rebuilt libode.so, ode.dll
* If you roll your own ODE library, make sure to update your opensim-libs.
2008-06-20 04:57:32 +00:00
1d91613679
* Patch from Dahlia - 0001576: Exception of type 'System.OutOfMemoryException' was thrown .Void set_Capacity(Int32), with regards to sphere mesh. Thanks Dahlia!
...
* Also allows a sphere to be hollow with no cuts or dimples. (walking around inside the sphere).
2008-06-19 17:21:17 +00:00
e6ce30d4f1
* 0001571: (PATCH) patch to implement editable sphere meshes for meshmerizer/ode (Initial Implementation) from Dahlia! Thanks Dahlia!!!
...
* The included patch implements the editor parameters twist, dimple, path cut, and profile cut to the sphere mesh for meshmerizer. The mesh will default back to the geodesic sphere if the parameters are adjusted to beyond a reasonable arbitrarily chosen threshold that would expose too many inverted normals on the mesh.
2008-06-19 04:17:04 +00:00
11d68ce0f5
* 0001558: [PATCH] Add support for full collision geometry feature set for linear path prims (patch attached) By Dahlia. Thanks Dahlia!
...
* This update re-does the cube/cylinder/prism prims to dynamically add faces as twist is used.
2008-06-15 19:34:48 +00:00
5910a49da6
Update svn properties. Formatting cleanup.
2008-06-10 08:35:46 +00:00
db151bcec7
*Fixed bug that caused failure when System.Console.Readline returns null (no stdin)
...
*Fixed bug that would crash the simulator if there were two physics/meshing engines loaded with the same name.
2008-06-09 15:20:08 +00:00
11246c284f
* Added a check for a non-finite heightfield array value passed to the ODEPlugin. This may, or may not fix anything.
2008-06-04 16:27:35 +00:00
99e7a2a380
* From Dahlia
...
* Committing : 0001449: Patch implements X and Y Top Shear parameters for torus prim physical mesh generation (PATCH attached)
* The included patch implements the X and Y Top Shear parameter adjustments to the mesh generator for the torus prim physical mesh. These are approximations as I was unable to determine their exact function but they appear to generate meshes which quite closely duplicate their counterparts in the viewer.
* Thanks Dahlia!!!!
2008-06-04 10:57:05 +00:00
4ec4e16c80
Formatting cleanup, minor refactoring, svn properties.
2008-06-04 09:59:27 +00:00
832d609b44
PATCH : 0001431: corrections to torus physical mesh for default hollow shape and taper orientation along path.
...
--------- From Dahlia! Thanks Dahlia!!!
the attached patch reinstates the default hollow shape of the physics mesh of the torus prim type and corrects the orientation of the effects of taper on the profile along the path.
2008-06-02 08:31:34 +00:00
c0f631dbdb
* While I couldn't reproduce it, I was able to see how it *might* happen, so therefore; fix to: 0001058: Physics crash when changing Type of Prim intersecting with ground.
2008-06-02 08:13:13 +00:00
52c55c8c23
* Applying Dahlia's patch : 0001429: Patch to fix prism physical mesh and add path start and end to skew z offset of circular path prim meshes (PATCH attached)
...
* Apparently this fixed a bug in my code that caused PushX to appear to work and pushX didn't appear to work after the patch.. so I fixed that after applying this patch and PushX actually works now.
2008-06-01 04:33:07 +00:00
0462510956
Update svn properties. Formatting cleanup.
2008-05-30 08:35:57 +00:00
45c6523904
* Fixes a few taper/top-sheer situations that were previously having issues.
2008-05-29 20:50:38 +00:00
918f887c0c
* Applying Dahlia's interim path curve patch. it adds initial support for some tori/ring parameters. Thanks Dahlia!
...
* Some situations do not match the client's render of the tori, we know and are working on it. This is an initial support patch, so expect it to not be exact.
* Some tapers are acting slightly odd. Will fix.
2008-05-29 20:20:50 +00:00
042c9ed4d8
* Adds Top Colliders when using ODE. Access it from the estate tools/debug tab.
2008-05-25 11:22:05 +00:00
c29409dc24
* Yet another way to optimize the sculpt mesh generator
2008-05-25 02:56:00 +00:00
f57cb17494
* kill a potentially large float array.
2008-05-25 02:50:17 +00:00
d3b013be1c
* Releases Pinned vertex/index list in ODE on next mesh request.
2008-05-25 02:39:58 +00:00
bdcfc2e322
* Prevent an error from stopping startup when decoding the sculpt mesh j2k fails.
2008-05-22 02:40:19 +00:00
6ec680918b
Formatting cleanup, minor refactoring. Fixed some comparisons of value types and null.
2008-05-18 23:06:50 +00:00
a5f08b430d
Formatting cleanup.
2008-05-17 00:06:35 +00:00
00a1f0bab0
* This finishes the ODE options section of the OpenSim.ini.example. I've added 44 configurable options!
...
* This includes if you want to mesh sculpties and the Level of detail on the sculptie meshing for non physical and a separate LOD on physical sculpties.
* The options range from gravity.. to avatar movement speed, to friction management.. to object density.. to update throttling.
2008-05-16 20:16:33 +00:00
65c5efe43b
Formatting cleanup.
2008-05-16 01:22:11 +00:00
afd5da6851
* Adds various tweakable avatar control options to the OpenSim.ini.example.
2008-05-15 23:11:31 +00:00
173d13b0a4
* Added about half of the planned ODE physics options to OpenSim.ini.example.
...
* Some will do cool things, some will make your scene explode dramatically if you're not careful.
2008-05-15 06:35:01 +00:00
66e6711f3e
* Got rid of an old crufty sleep that was being called. Thanks for your support in load testing Adam's simulator was what pointed this old crufty sleep out.
...
* Please, we need more load tests with profilers running. :D
2008-05-15 02:48:32 +00:00
2a988f187e
* Refactored IConfigSource into Physics plug-ins and Scene. We can get rid of some of the parameters we pass to it's constructor now like, 'm_allowPhysicalPrim', 'seeIntoOtherRegions', etc.. so on
...
* The main purpose of this is to provide configuration options for ODE and other physics plug-ins that are advanced enough to be able to be configured.
2008-05-14 23:15:25 +00:00
6a1b787436
More formatting cleanup.
2008-05-14 05:33:32 +00:00
c995d60d37
Formatting cleanup.
2008-05-14 05:11:23 +00:00
5548dd6b06
* Some more bulletx physics fixes from Jed (DeepThink)
2008-05-13 17:05:52 +00:00
fcc23be577
* Fixed directory not found when saving Mesh previews (my bad, I was testing)
2008-05-13 05:06:58 +00:00
e70da2e174
* Committing meshmerizer patch from Dahlia. Thanks Dahlia!
...
* 0001241: physics cylinder proxy distorted and square hollow misaligned (patch attached)
* The included patch corrects the outer shell of the meshmerizer proxy for the cylinder prim to eliminate spurious vertices and shape distortion, and corrects the orientation of the square hollow.
* The size and orientation of the square hollow for the prism prim has been corrected also.
2008-05-13 04:16:16 +00:00
93ec7f0c3c
* Patch from Jed (DeepThink) - More optimisations for BulletX renderer. Trimesh collisions should now work relatively efficiently. BulletX plugin should now be functional - feedback would be appreciated as to how it performs vs ODE.
2008-05-09 17:17:54 +00:00
b7baa3cd2a
* Valid Sculpted prim now collide properly.
...
* The first time you set the sculpted texture of a prim you might have to futz with it to get it to generate a sculpted physics proxy
* Note that there are already issues in Trunk, (such as the prim scaling issue and prim jumping issue. Essentially editing is difficult right now)
* This just adds to the experimental nature of trunk. :D
2008-05-09 07:50:00 +00:00
6bb4ab0563
* Applying Dahlia's Triangular hole in a cube peg patch. Fixes the hollow orientation in a cube in the meshmerizer. Thanks Dahlia!
...
* See mantis 0001203 for more details!
2008-05-09 02:00:55 +00:00
7e275bfa37
* Wrote a method to get the OpenJpeg data of a sculpt texture asset and save it to the prim shape.
...
* Added some stuff around sculpted prim meshes.. but it's just there so the project compiles now.
2008-05-09 01:28:54 +00:00
08ec34e4d3
* Removed ODELock message since it wasn't telling us anything important and people seemed to think it was the cause of their issues rather then a message to help locate a situation where physics stalls for a second and then kicks.
...
* This was simply a message added when an avatar was added/removed from the scene.
2008-05-08 16:07:41 +00:00
cf7560d1aa
* Commit from Jed Zhu (DeepThink) - Initial implementation of mesh collision into BulletX plugin. Additional work to come in the next few days.
2008-05-08 13:32:15 +00:00
ba8ff761c0
* Reduced sleep durations in a number of files.
2008-05-08 04:47:38 +00:00
240e8646da
* If you llApplyImpulse on an attachment, it applies impulse on the avatar, not the attachment.
2008-05-06 00:23:19 +00:00
e8acb49fef
* For your fragging desire, damage enabled land works, but watch out!, life does not regenerate until you're dead!
2008-05-03 15:39:40 +00:00
07167c9a3f
* Committing some collision stuffs that I'm working on.
...
* Nothing user facing yet.
2008-05-03 04:33:17 +00:00
01f31fd933
* Breaking all the code, breaking all the code..!
...
* Made a bunch more members static, removed some dead code, general cleaning.
2008-05-01 16:23:53 +00:00
d51ce47b2d
Update svn properties. Minor formatting cleanup.
2008-05-01 14:31:30 +00:00
1d9c68969e
* ODE Tweak. See if this helps.
2008-05-01 00:54:21 +00:00
911e63765c
* Single Attachments now work from inventory. You can attach from inventory and detach from inventory.
...
* Detaching from right clicking in world, detaches to your inventory.
* If you go up to a prim and attach it from in world, it appears in your inventory.
* Attachment placement is saved when you detach them.
* Choosing wear remembers your last attachment point from inventory.
* Wrote a method to update an inventory item's asset and sends the updated inventory item to the Client
* Wrote a recursive method to find the folder of a known existing inventory item.
* Removed a block on physics object position on creation. This might crash a region or two, let us know via Mantis if your region crashes because of a physics out of bounds error.
* Drop doesn't work. The menu item doesn't even come up. Don't know why :P.
2008-04-27 20:10:28 +00:00
d023c331f8
* Tuned the llMove2Target PID controller to be more reasonable and not overshoot the target.
2008-04-24 22:26:26 +00:00
aa8aee90a3
* Adds much better support for attachments that you right click on in world.
...
* Your friends can see your attachments now. People who appear in the sim after you've attached something can also see your attachments.
* You can position & rotate your attachments now. Positions do *not* save.
* You can detach attachments now the regular way.
* Attachments do not cross into other regions with you..(this isn't too far off)
* Updated ODE to not request terse updates on child prim.
2008-04-24 11:32:41 +00:00
2a3bdde0fa
* Adds llSetStatus(STATUS_ROTATE_X | STATUS_ROTATE_Y | STATUS_ROTATE_Z,TF)
...
* Currently if you apply that to only one or two axis you get unpredictable and sometimes explosive results.
* Three axis works well enough to play with it anyway. More work is needed here.
* Fixed an incorrectly named method in ODE.NET
2008-04-23 15:32:19 +00:00
fef3b36894
* Optimised using statements and namespace references across entire project (this took a while to run).
2008-04-21 07:09:17 +00:00
9fec575b3e
* Made it safe again to use the restart button from the estate tools and the restart console command.
...
* It looks ugly on the console.. but it's really safe.. and restores some memory.
2008-04-10 10:27:03 +00:00
b85624db18
* Adds twist support for Cubes, Cylinders, and Prisms in the Meshmerizer
...
* A tweak of the SimStatsReporter so it would report the prim capacity to be 45000.
2008-04-10 00:31:44 +00:00
95e31c9f02
* Added stretchable ellipsoid support with configurable LOD. It's actually a split facet icosahedral geodesic sphere that's scaled.
...
* In other words, you can stretch spheres into oblong shapes now and watch them roll around like a football would.
* Still can't cut, twist or profile cut spheres yet.
2008-04-08 05:03:43 +00:00
d0f7784101
* Adds poor support for ellipsis in the Meshmerizer. This will get better.. notice the huge nasty facets! Regular spheres still work as they did.
2008-04-08 01:29:45 +00:00
e409892a9c
* Updated ODE.NET bindings to the ODE library.
...
* Fixed some Tapers with Cylinders in the Meshmerizer
2008-04-07 22:11:41 +00:00
899f00b83d
* Fixed up some documentation
...
* Should help the sinking feeling when new avatar arrive in the scene.
2008-04-06 06:42:54 +00:00
2d33bf854f
* ODEPlugin: put a limit on the minimum size a prim can be ( scale <=0 ).
2008-04-03 04:02:46 +00:00
b790a16e98
* Updating the version of the ODE library. (big update). The Mac library needs to be updated still.
...
* Adding some XMPP stuff that's incomplete.
2008-04-02 01:03:31 +00:00
8aa4308097
* Minor cleanup
2008-03-30 19:58:14 +00:00
86128ba4d4
Fix compiler warnings in BulletXPlugin.
2008-03-29 04:30:19 +00:00
9d1b42c39a
Comment out unused private methods.
2008-03-25 03:49:08 +00:00
a7556af7de
Fix a few compiler warnings.
2008-03-25 03:37:48 +00:00
a21112ccee
* Adds llMoveToTarget and llStopMoveToTarget support to the ODEPlugin.
...
* It doesn't generate at_target events, because they don't exist yet in the script engine.
* The Tau is different, however, compatible with scripts I tested.
* Not perfect... but pretty good.
2008-03-25 03:36:31 +00:00
21e5e65bb7
Comment out "m_randomizeWater" and "ms" until we use them later.
2008-03-21 16:52:55 +00:00
bf8b5844f2
Formatting cleanup. Minor refactoring.
2008-03-18 14:51:42 +00:00
0b7626b630
* Remove unused (and somewhat nonsensical) method in PhysicsActor
...
* Thanks for DrScofld for drawing attention to this
2008-03-18 11:37:34 +00:00
47180080f0
Formatting cleanup.
2008-03-18 05:16:43 +00:00
abacfba287
* Preliminary work with the ODEPlugin to collect collision data.
2008-03-14 05:22:52 +00:00
f46fcbb9d2
* Added Linear Acceleration reporting to the ODEPlugin.
...
* Added support for LSL llGetOmega (Rotational/Angular Velocity)- ODEPlugin is the only physics plugin that reports it.
2008-03-10 14:14:44 +00:00
d0123a796b
ODEPlugin
...
* Added osSetPrimFloatOnWater(BOOL) to make Physical prim float at the water level.
* osSetPrimFloatOnWater(TRUE); or osSetPrimFloatOnWater(FALSE);
* By default, prim do not float at the water level.
* More work is needed on the floating, but it's a start.
2008-03-10 05:56:58 +00:00
8bea3dbdb9
* Added ODEPlugin Support for llSetBuoyancy. Set Buoyancy to 1 for space prim.
...
* Added WaterLevel support to the ODEPlugin. More on this later.
2008-03-10 05:23:43 +00:00
8bba8e232c
* Fixed a few things and enabling Physical Prim border crossings again.
...
* Everyone try to push a physical prim across a region border now.
2008-03-09 20:29:59 +00:00
7cae577094
ODE Plugin
...
* More cleanup
* Less noise
2008-03-09 17:50:24 +00:00
5b6eba968b
* Fixed the Link + Duplicate + Unlink both = 'ODE Invalid Argument in Collision Space Crash'
...
* Added: Console comment: [PHYSICS]: The scene reused a disposed PhysActor! *waves finger*, Don't be evil.
2008-03-09 16:32:44 +00:00
081b2ac34e
* Cleaned up some locking on the ODEPlugin to make it more developer friendly
...
* Expect the occasional deadlock?
2008-03-09 15:43:01 +00:00
0cb4e401ad
* Killed 4 more warnings (at 16 now)
2008-03-06 09:41:34 +00:00
1410210b84
* Four more warnings, etc etc.
2008-03-05 22:00:41 +00:00
810d2126ea
* Three more warnings are a-gone.
2008-03-05 21:56:14 +00:00
cd6f4a57e7
Added copyright heaaders. Minor cleanup.
2008-03-04 04:11:37 +00:00
d015356902
* Applied patch 708 from devalnor. Thanks devalnor!
...
* ODE: Added support for larger box stacks. (they're slow, but they work)
* ODEPlugin no longer tries to 'catch up' with the simulator frame rate if it gets behind. Catching up was causing a lot of problems with larger box stacks and other things that stall the simulator (like saving prim in the datastore)
2008-03-03 16:52:25 +00:00
0a5c48b1c8
* This is a very icky implementation of physical linkset prim using fixed joints. This will change quite drastically, however it's fun to play with.
...
* To play with this you must link your prim before setting it physical, otherwise they won't link in the physics engine properly. This will also be fixed.
* Currently the linked prim are extremely unstable because I have yet to implement combining of forces with the same normal. This will also be fixed. In fact, the whole PhysicsActor, ODEPrim relationship will be reworked to consider groups from the get-go.
* This implementation is better then it crashing your sim, so I'm commiting it for now.
2008-03-02 09:31:39 +00:00
fa7322eac9
* Fixed Cylinder mass formula using diameter instead of radius.
2008-02-29 06:55:31 +00:00
fe1f15f4ec
* killed a 'new mass' debug line.
2008-02-29 05:50:40 +00:00
e333eaf4b6
* ODEPlugin
...
** Added more realistic calculations of mass for the rest of the supported prim shapes+holes+cuts+tapers. Previously they were the generic height * width * length. Spheres roll (Angular velocity) more realistically, etc.
2008-02-29 05:46:24 +00:00
95def8c636
* Adds unit test glue to the OdePlugin.
...
* Adds one unit test. CreateAndDropPhysicalCube.
* More unit tests will be done
* Let me know if this breaks Linux build..
2008-02-24 04:06:01 +00:00
bbb8b66908
* Made Physics updates a teensy bit more responsive. A previous CPU optimization of mine slowed the speed of updates using the 'poll' method in certain circumstances.
2008-02-23 12:46:23 +00:00
db264013d4
* One more fix to the selected feature
...
* Don't act immediately on a physical prim unless it's moving.
* This helps when you're trying to make a box stack and you select the bottom most box.
2008-02-23 12:26:37 +00:00
27508c1ad8
* Added Support within the ODEPlugin for Selected. Which means that;
...
* When you select a physical prim, it stops while you've got it selected.
* When you move or alter a prim in some manner, it doesn't become collidable until you de-select it
* When you select a prim, it doesn't become temporarily 'phantom' until you make some change to it while it's selected. (this prevents accidental selections in prim floor from causing it to go phantom on you(but don't move it or you'll fall))
* There's one major difference, and that's a physical object won't stop if you don't have permission to edit it. This prevents people who don't have edit permissions on a prim from stopping it while it's moving.
2008-02-23 11:42:55 +00:00
640ad259d4
* A few additional null checks in the Physics Scene and PhysicsActor so we don't try to enumerate dead null ODECharacter objects when things get *really* slow.
2008-02-21 14:51:39 +00:00
740ce20d9d
* Found the land bug, yay
2008-02-20 20:07:12 +00:00
a8cfbbe963
Minor cleanup.
2008-02-20 18:38:20 +00:00
07774473af
* Fixed a long standing race condition in physics events. Could this be the source of the null on multicast_void: error?
2008-02-20 17:50:19 +00:00
cfc9ee4265
* Adds limited support for each hollow type for the supported prim., Cube with a triangle hollow, Cube with a cylinder hollow, cylinder with a triangle hollow, etc.
...
* More work needs to be done here as several of the profileshape/hollow combinations are rotationally offset from where they render in the client.
2008-02-19 16:01:14 +00:00
62f608b152
*rawfile fix.
2008-02-19 08:57:43 +00:00
e789a6bc9b
* This patch adds Prism support to the Meshmerizer. Prism is one of the object types in the drop down on the object tab. Positive tapers are slightly incorrect(prim sinks into ground a tiny bit). Everything else that's supported works as expected. Hollow, cut, negative tapers, top shear.
2008-02-19 08:49:38 +00:00
c62328950a
More exception checks and crash hints
...
If no scriptengine is specified then don't try to load any.
2008-02-18 14:21:51 +00:00
8edaada1d3
ODE: Tired of floating above the ground after crossing a border? Boy have I got a solution for you! For a limited time, you can be the right height after border crossings automatically. Just three easy payments of $9.95 and make sure your neighbor is sending child agent updates!
2008-02-18 01:52:25 +00:00
c2d7beb617
* Last bit of cleanup now. As long as you keep physical prim off, you should have a reasonably stable experience with ODE again.
...
* Physical prim at the simulator edge still seems to have the occasional issue.
2008-02-17 20:40:21 +00:00
f80a534eb0
* Various ODE Cleanups
2008-02-17 20:04:28 +00:00
89349a3810
* Disabling physical prim crossings until they get a bit more stable.
2008-02-17 12:10:47 +00:00
e33a0c5fc0
* Fixed the Ghost physical hull on deleting a physical Prim
...
* Fixed a deadlock when there is an exception in the collision and stepping parts of Simulate.
2008-02-17 11:50:15 +00:00
19e0ada93a
* Located and destroyed the weird velocity and rotation transfers. It turned out to be that the Static PhysicsVector.Zero was transferring velocities between all non fixed objects. Not so static after all :(. Finding it was cruel and unusual punishment from the CLR.
...
* Therefore, when you run through a pile of prim you won't see things rotate when they're not supposed to anymore.
* Avatars don't float off either.
2008-02-17 10:41:08 +00:00
3b9d332f84
Added copyright notices.
2008-02-17 01:16:40 +00:00
be6edefcfb
* ODE Stability update 4 :D
...
* Changed the way meshing requests get sent to the ODEPlugin
* Numerous other fixes
2008-02-15 21:35:52 +00:00
f3afa68a2a
* Made new Framework.Constants class, added RegionSize member.
...
* Converted all instances of "256" spotted to use RegionSize instead. Some approximations used for border crossings (ie 255.9f) are still using that value, but should be updated to use something based on RegionSize.
* Moving Terrain to a RegionModule, implemented ITerrainChannel and TerrainModule - nonfunctional, but will be soon.
2008-02-14 12:16:33 +00:00
135a72d6ca
* Removed the noise from the console. The last commit seems to have resolved the recent reports of 'argument not a space' on linux. Though, there were about 50 changes :D
2008-02-14 10:07:15 +00:00
bd880f9178
* Another ODE Stability update. This might fix the recent Linux issues with the ODEPlugin.
2008-02-14 09:31:22 +00:00
e3a711536b
* ODE - This fixes a few things and breaks a few more.
2008-02-14 01:57:19 +00:00
4e005fc225
Cleaned up some typos.
2008-02-14 00:44:21 +00:00
0d14c47c28
* Bigisn ODE Stability update 2
2008-02-14 00:39:08 +00:00
3588d89b2c
* Bigish ODE stability Update. Run Prebuild
2008-02-13 23:14:41 +00:00
2e89c01851
* This fixes mantis 553 (It appears that the exception is thrown when there is a collision with a cylinder that is both hollowed and either tapered or cut. The sequence of actions that reproduce the problem for me are: create a cylinder, hollow to 95%, taper X/Y, then collide it with another object or avatar. Note that the cylinder itself is not marked physical. )
2008-02-13 19:06:35 +00:00
c1044039d4
* Removed a debug line that got called every frame.
2008-02-13 08:37:50 +00:00
UbitUmarov