ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-26 08:35:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,368 Commits 5 Branches 106 Tags
fc576df273e41b47ff66b4bb503b9f86ded96cdb
Commit Graph

485 Commits

Author SHA1 Message Date
UbitUmarov
3b56c44453 changed seletion code. SOP now knows about parts selection. UI actions are sent to SOP and this reports to SOG. Group is selected if any part is selected.sop.isSelect get() is only used in SOG. Will need to be improved for better performance on largelinksets. *UNTESTED* NEEDS CHECKING for side efects 2012-04-20 18:51:32 +01:00
UbitUmarov
aeb5aed5b7 changed - VolumeDetect and phantom setting interaction. Script VD(true) forces phantom ON. UI phantom off turns off VD. Other transitions should only change specific parameter. This is not as current SL. - Fixed volumedetect prims being wrongly removed from physics. 2012-04-19 23:01:22 +01:00
UbitUmarov
c4a9eae961 make llGetGeometricCenter() work as in current SL. Now this is not real geom center but a average of positions relative to root prim ignoring prims details, so no need to use physics engine. 2012-04-09 23:33:42 +01:00
UbitUmarov
ad544bdd3d sop.AddToPhysics(..) fixed and in use. For now it seems it needs to set sop.PhysActor, so made it return void. 2012-04-09 18:03:37 +01:00
Melanie
b39de2425c Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/CoreModules/World/Land/LandObject.cs
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-04-07 04:52:14 +01:00
Justin Clark-Casey (justincc)
cce760dbfc Rather than having a FromFolderID property on every single prim and only ever using the root prim one, store on SOG instead. 
This reduces pointless memory usage.
 2012-04-07 00:40:55 +01:00
Justin Clark-Casey (justincc)
7d8bb33c5b Store FromItemID for attachments once on SOG instead of on every SOP and only ever using the root part entry. 
This eliminates some pointless memory use.
 2012-04-07 00:33:02 +01:00
Justin Clark-Casey (justincc)
70b5a2dace refactor: Eliminate unnecessary SOP.m_physActor 2012-04-06 23:49:23 +01:00
Justin Clark-Casey (justincc)
3af1cd65f9 Fix llGetLinkPrimParams for PRIM_POS_LOCAL for child prims whether in scene or attachments. 
Return relative position to root prim rather than 0,0,0.
Should fix same issue with llGetLocalPos()
http://opensimulator.org/mantis/view.php?id=5951
 2012-04-06 22:41:35 +01:00
UbitUmarov
016079ef27 minor changes.. a few physicsactor -> pa and a use a constant with |'ed bit fields in place of 6 individual checks ||'ed 2012-04-04 18:24:56 +01:00
UbitUmarov
867d50d14c remove more merge artefacts 2012-04-04 17:01:29 +01:00
UbitUmarov
787cc0d076 reverted changes to llApplyRotationalImpulse execution in SOP/SOG. This functions naming is misleading, Here Apply means to apply a instante impulse that may add to previus unprocessed ones and not setting a permanente torque (that is done by llSetTorque). 2012-04-04 16:38:29 +01:00
Melanie
726915e9ef Fix the last merge artefacts 2012-04-03 23:38:12 +02:00
Melanie
dbec5e9859 Fix more merge artefacts 2012-04-03 23:22:47 +02:00
Melanie
7154d480b9 Remove duplicate implementation of Material { get; set; } 2012-04-03 23:18:07 +02:00
Melanie
1c4bcf3fed Fix merge artefacts 2012-04-03 23:13:48 +02:00
Melanie
63c44719f7 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-04-03 23:52:53 +01:00
Justin Clark-Casey (justincc)
633f4bb3d8 remove possible PhysActor unexpectedly null race conditions when changing prim collision status 
factor out common SOP physics scene adding code into a common SOP.AddToPhysics() that is the counterpart to the existing RemoveFromPhysics()
 2012-04-03 09:28:17 +01:00
Justin Clark-Casey (justincc)
7468299673 Eliminate race condition where many callers would check SOP.PhysicsActor != null then assume it was still not null in later code. 
Another thread could come and turn off physics for a part (null PhysicsActor) at any point.
Had to turn off localCopy on warp3D CoreModules section in prebuild.xml since on current nant this copies all DLLs in bin/ which can be a very large number with compiled DLLs
No obvious reason for doing that copy - nothing else does it.
 2012-04-03 05:51:38 +01:00
UbitUmarov
68736aa460 fix a bad reset of shapetype on pbshape change, added missing checksculpload ( to reload mesh on change ) 2012-03-21 15:27:33 +00:00
UbitUmarov
f6cbafcaf0 Changes of PrimShapeType should now work with UbitOde ( almost untested ) 2012-03-21 02:39:16 +00:00
UbitUmarov
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
Melanie
70c0d6cf0b Merge branch 'ubitwork' 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
 2012-03-20 18:07:24 +01:00
Melanie
7f7801ecb9 Cover the case where prims are loaded and ParentGroup is not yet set 2012-03-20 18:02:43 +01:00
UbitUmarov
efd7ff3146 add some more notifications about changes on physical parameters ( still incomple and there should be a better away ) 2012-03-20 16:46:16 +00:00
Melanie
f2d17433bb Cause prims to be saved if extra physics parameters are changed 2012-03-20 12:34:06 +01:00
UbitUmarov
ae8e089b9c some more work on costs 2012-03-16 15:33:49 +00:00
UbitUmarov
84ca09f7c5 added ObjectPhysicsProperties http event message to send viewer that data. For now on caps/EventQueue, and still only used on a material change... 2012-03-15 02:24:13 +00:00
UbitUmarov
cf9ebd301c bug fixs, added a default physics shape estimator based on being a mesh or not and use it on unlink if new root part as type none. Viewer doesn't get updated even with fullupdates we are missing something still 2012-03-14 18:24:04 +00:00
UbitUmarov
741badc4fa let PhysicsShapeType none remove physics remove physics on child parts **UnTested** 2012-03-13 19:24:41 +00:00
UbitUmarov
3de3b9e63c initial suport for ExtraPhysical parts parameters. Reading from llclientView to SOP including SOPserialization (not to databases). No action on physics still. No send to viewer, etc 2012-03-13 17:56:32 +00:00
Melanie
ebcd4910a2 Refactor, move OjectChangeData into it's own file and rename 
ObjectChnageWhat what into ObjectChangeType change. What is
no name for a variable or type!
 2012-03-13 13:08:32 +01:00
UbitUmarov
a35e00e81e allocate UndoRedoStore only on demand 2012-03-12 07:50:14 +00:00
UbitUmarov
7832889437 Physical phantoms testable with chOde. Volume detection was changed and also needs testing. Started making it more independent of phantom acording to new sl. ** 99.999...% UNTESTED *** 2012-03-11 11:01:38 +00:00
UbitUmarov
ab235abc46 Changed undo redo internals. moved exec code to UndoState.cs from sop that now only sees a unified UndoRedoStore class, added size limit on buffers so only last 5 undo/redo are kept. (5 is hardcode like it was ) ***UNTESTED*** 2012-03-11 00:36:34 +00:00
UbitUmarov
908abb1c3d BIG MESS. changed Iclient interface so only one event is used to inform scene about position scale or rotation change by client (others can be added). Its served at SceneGraph that does permition checks, undostore and sends down to SOG. changed values are stored in a class (ObjectChangeData) and what is changed as a enum (ObjectChangeWhat) with bit fields and 'macros' of this for better readability (at top of scenegraph.cs lasy to find better place for now) this can be extended for other things clients changes and need undo/redo. SOG process acording to what is changed. Changed UNDO/redo to use this also (warning is only storing what is changed, previus stored all, this must be checked for side efects. to save all PRS change commented line in scenegraph). Still have excessive calls to ScheduleGroupForTerseUpdate. **** UNTESTED **** 2012-03-10 20:32:19 +00:00
Melanie
e1be1c5263 Merge branch 'ubitwork' 2012-03-09 02:11:25 +01:00
UbitUmarov
05cdf9bda9 more changes in undo/redo. Basicly moved control to llclientview.cs. later we can move back to a dispatcher function on SOG that handles the several cases( in a viwer independent way (?)) and calls current exec funtions. made cosmetic changes replacing decimals by hexs so bits are easier to read. Changed behavour of case 12 and 28 ( 0x0c and 0x1c) to make identical to 0x0d and 0x1d ( scale only and scale plus position). DOn't see 12 and 28 in use... cases 1c and 1d still broken 2012-03-09 01:53:58 +00:00
Melanie
3089344114 Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster 2012-03-08 19:09:11 +00:00
UbitUmarov
3d3b81e676 changes on undo/redo (untested/incomplete). Think we may consider moving this mfrom SOP to client side. At least does seem to work a bit better ( again there wwas a issue on sop.copy ) 2012-03-07 07:31:26 +00:00
Melanie
f8b1b86c3a Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
 2012-03-07 01:05:32 +00:00
Melanie
7769362687 Always zero the PhysActor on dupes to prevent side effects on the orignal prim 2012-03-07 01:03:26 +00:00
Melanie
17b1454d6f Null PhysActor on SOP.Copy() to prevent clobbering the original one 2012-03-06 20:20:12 +01:00
UbitUmarov
cca94aaefc make copied parts have diferent LocalIds than original. More building control for ubitODE. for all let physics know about linking of physical parts. Assume UNTESTED 2012-03-06 05:13:39 +00:00
Melanie
aee4ca2f1c Fix vehicles going physical stopping llTargetOmega parts (boat radar) 2012-02-27 08:50:19 +01:00
Melanie
fca8c82232 Move KeyframeMotion from SOG to SOP because we can't persist it any 
other way because SOG doesn't technically exist in the DB
 2012-02-26 18:11:38 +01:00
Melanie
8cdc115c91 Fix deserialization of Buoyancy, Force and Torque. Remove debug from the new 
code.
 2012-02-26 14:30:24 +01:00
Melanie
9a15bba99b Fix an infinite recursion caused by checking the wrong values for 
Buoyancy, Force and Torque
 2012-02-26 13:31:29 +01:00
Melanie
e9120890a2 Merge branch 'ubitwork' 2012-02-26 02:41:41 +01:00
Melanie
c82709c0d6 Implement llSetKeyframedMotion. No persistence, no region crossing. Yet. 2012-02-26 02:36:34 +01:00