Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2012-11-15 | 1 | -0/+33 |
|\ | |||||
| * | Added AssemblyInfos to every dll in the OpenSim.Region namespace. | Diva Canto | 2012-11-14 | 1 | -0/+33 |
| | | |||||
* | | add mesh cache expire on region startup. Expires will be relative to | UbitUmarov | 2012-10-13 | 1 | -0/+1 |
| | | | | | | | | | | | | previus expire (assumed done only once at startup). File 'cntr' on cache folder stores time. Deleting it will force a skip on expire. Default time is 48hours before previus startup to account for failed ones etc. | ||||
* | | force allocation of mesh data on creation ( messy code version ) | UbitUmarov | 2012-10-09 | 2 | -1/+3 |
| | | |||||
* | | refix so we can compile it, loosing alpha scultps fix on core meshmerizer | UbitUmarov | 2012-10-07 | 1 | -0/+11 |
| | | |||||
* | | fix wrong file commited | UbitUmarov | 2012-10-07 | 1 | -10/+0 |
| | | |||||
* | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-10-07 | 1 | -24/+7 |
|\ \ | | | | | | | | | | | | | Conflicts: OpenSim/Region/Physics/Meshing/Meshmerizer.cs | ||||
| * | | comment out a spam coment on core Meshmerizer | UbitUmarov | 2012-10-07 | 1 | -26/+4 |
| | | | |||||
* | | | more changes. Most code not in use | UbitUmarov | 2012-10-04 | 1 | -0/+6 |
| | | | |||||
* | | | introduce a ODEMeshWorker class, should be pure cosmetic changes for now | UbitUmarov | 2012-10-03 | 1 | -0/+5 |
|/ / | |||||
* | | ** DANGER someone should stress test more ** release unused physics meshs, ↵ | UbitUmarov | 2012-08-06 | 1 | -0/+2 |
| | | | | | | | | including unmanaged memory allocations (allocated by managed code) | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-07-16 | 1 | -143/+183 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | update PrimMesher.cs to dll version r72 which fixes some path errors in ↵ | dahlia | 2012-07-13 | 1 | -143/+183 |
| | | | | | | | | sliced linear prims. Addresses Mantis #6085 | ||||
* | | Downgrade an error log message to info because there is nothing we can do if | Melanie | 2012-04-16 | 1 | -1/+1 |
| | | | | | | | | an asset is damaged so it should not spew red ink. | ||||
* | | Merge branch 'ubitwork' | Melanie | 2012-03-20 | 1 | -0/+5 |
|\ \ | |||||
| * | | let convex be a parameter to createMesh so it can be used. Was forced to add ↵ | UbitUmarov | 2012-03-21 | 1 | -0/+5 |
| | | | | | | | | | | | | it also to original mesher code and zeromesher | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-03-20 | 1 | -1/+1 |
|\ \ \ | |/ / |/| / | |/ | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| * | Add prim name to "[MESH]: No recognized physics mesh..." log message | Justin Clark-Casey (justincc) | 2012-03-20 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'ubitwork' | Melanie | 2012-02-19 | 3 | -29/+126 |
|\ \ | |/ |/| | | | | | | | Conflicts: OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs | ||||
| * | Use mesh to estimate real center of prims if avaiable. Let sculpt map ↵ | UbitUmarov | 2012-02-11 | 3 | -29/+126 |
| | | | | | | | | 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) | ||||
* | | Comment out "experimental" log message printed out whenever a physics mesh ↵ | Justin Clark-Casey (justincc) | 2012-02-16 | 1 | -2/+2 |
|/ | | | | | | was generated for a mesh Also adds prim name to the "no asset data" error log message | ||||
* | minor: remove mono compile warning, a Vector3 can never be null since it's a ↵ | Justin Clark-Casey (justincc) | 2011-11-29 | 1 | -9/+6 |
| | | | | struct | ||||
* | Move GetMeshKey from buried inside Meshmerizer to a public method on ↵ | Robert Adams | 2011-08-28 | 1 | -62/+1 |
| | | | | | | PrimitiveBaseShape Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | ||||
* | Add level of detail specification to optionally reduce the number of ↵ | Robert Adams | 2011-08-28 | 1 | -5/+31 |
| | | | | | | vertices in generated prim meshes Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | ||||
* | refactor: extract method that generates a physics mesh from prim shape data | Justin Clark-Casey (justincc) | 2011-07-30 | 1 | -117/+141 |
| | |||||
* | refactor: extract code which generate points and faces from sculpt data into ↵ | Justin Clark-Casey (justincc) | 2011-07-30 | 1 | -220/+240 |
| | | | | | | it's own method. fix build break. | ||||
* | fix bug in previous commit | Justin Clark-Casey (justincc) | 2011-07-30 | 1 | -1/+2 |
| | |||||
* | refactor: move the code that generates physics meshs from prim mesh data ↵ | Justin Clark-Casey (justincc) | 2011-07-30 | 1 | -99/+123 |
| | | | | into a separate method, in order to make the code more readable. | ||||
* | Return null from CreateMeshFromPrimMesher if OpenJPEG decoding of the sculpt ↵ | Justin Clark-Casey (justincc) | 2011-07-29 | 1 | -1/+11 |
| | | | | | | data fails. This is to address http://opensimulator.org/mantis/view.php?id=5612 | ||||
* | Fix physics proxy regeneration when a mesh with more than one submesh is resized | Justin Clark-Casey (justincc) | 2011-07-16 | 1 | -1/+4 |
| | | | | Addresses http://opensimulator.org/mantis/view.php?id=5584 | ||||
* | minor Tack the prim name on the end of the "experimental mesh proxy ↵ | Justin Clark-Casey (justincc) | 2011-07-11 | 1 | -1/+1 |
| | | | | | | generation" message. Can probably comment out this message soon, once a few other issues are tidied up. | ||||
* | minor: code tidy and inserted log lines for future use. | Justin Clark-Casey (justincc) | 2011-07-09 | 1 | -2/+3 |
| | | | | | | | | 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. | ||||
* | refactor: eliminate redundant return statement | Justin Clark-Casey (justincc) | 2011-07-08 | 1 | -3/+1 |
| | |||||
* | refactor: Factor out AddSubMesh() method from long ↵ | Justin Clark-Casey (justincc) | 2011-07-08 | 1 | -44/+53 |
| | | | | | | CraeteMeshFromPrimMesher() method Also remove some of the logging spam left in from the last commit. | ||||
* | Fix interpretation of physics mesh proxies from mesh data | Justin Clark-Casey (justincc) | 2011-07-08 | 1 | -0/+10 |
| | | | | | | | | 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. | ||||
* | minor: commented out log lines for future use and very small code tidy | Justin Clark-Casey (justincc) | 2011-07-08 | 1 | -0/+2 |
| | |||||
* | Allow physics proxy generation for meshes using new asset format. | dahlia | 2011-06-29 | 1 | -4/+17 |
| | | | | Fix an invalid cast exception while decoding new mesh asset format. | ||||
* | partial update for new mesh asset format - handle both old and new formats ↵ | dahlia | 2011-06-10 | 1 | -1/+5 |
| | | | | for physics mesh | ||||
* | Fix crash when [Mesh] section is missing from configuration files | Dan Lake | 2011-04-29 | 1 | -1/+2 |
| | |||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2011-04-21 | 1 | -3/+10 |
|\ | |||||
| * | fix meshing failure on sculpt maps smaller than 64x64 | dahlia | 2011-04-19 | 1 | -3/+10 |
| | | |||||
* | | Group collada meshies settings under [Mesh] in OpensimDefaults.ini | BlueWall | 2011-04-21 | 1 | -1/+2 |
|/ | |||||
* | minor: remove some compiler warnings | Justin Clark-Casey (justincc) | 2010-12-10 | 2 | -2/+2 |
| | |||||
* | catch an exception when a mesh asset header cant be decoded | dahlia | 2010-11-24 | 1 | -2/+9 |
| | |||||
* | * Updated libomv to r3461 | Latif Khalifa | 2010-10-24 | 1 | -2/+2 |
| | | | | 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. | ||||
* | fix combining of multiple physics submeshes | dahlia | 2010-10-20 | 1 | -3/+4 |
| | |||||
* | remove some cruft from last commit | dahlia | 2010-10-18 | 1 | -8/+0 |
| | |||||
* | initial support for meshies physics. Must set ini option ↵ | dahlia | 2010-10-18 | 1 | -43/+94 |
| | | | | UseMeshiesPhysicsMesh = true to enable. See file OpenSimDefaults.ini for example. | ||||
* | one more silly line ending thing.... *If you have problems, fetch the tree ↵ | Teravus Ovares (Dan Olivares) | 2010-10-15 | 1 | -71/+71 |
| | | | | | | and rebase. Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com> | ||||
* | more work in progress on mesh physics - still non-functional | dahlia | 2010-10-14 | 1 | -2/+67 |
| |