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
dahlia