aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/Meshing (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-05-241-6/+78
|\ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
| * add decoder for bounding convex hulldahlia2013-05-231-4/+53
| |
| * Add DEBUG level logging in Meshmerizer for mesh parsing. There isRobert Adams2013-05-231-2/+25
| | | | | | | | a compile time variable to turn this logging off if it is too spammy.
* | Merge branch 'master' into careminsterMelanie2013-05-241-21/+110
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * fix error in hull point indexingdahlia2013-05-181-1/+1
| |
| * remove duplicate hull scalingdahlia2013-05-181-3/+3
| |
| * add prototype code to decode convex hulls from mesh assets. Please do not ↵dahlia2013-05-181-21/+110
| | | | | | | | use yet; the interface will be defined in a later commit.
* | Merge branch 'master' into careminsterMelanie2013-05-161-0/+4
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
| * fall back to using a display mesh for physics proxy if no physics_mesh entry ↵dahlia2013-05-151-0/+4
| | | | | | | | was wound in a mesh asset
* | Merge branch 'master' into careminsterMelanie2013-02-221-1/+1
|\ \ | |/
| * Deleted all AssemblyFileVersion directivesDiva Canto2013-02-191-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-02-061-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * BulletSim: remove degenerate triangles from meshes. This fixes theRobert Adams2013-02-051-1/+1
| | | | | | | | | | | | | | | | | | invisible barriers in sculptie doorways (Mantis 6529). Bump up level-of-detail for physical meshes to 32 (the max). This fixes the invisible barriers that showed up in prim cut arches. NOTE: the default LOD values are removed from OpenSimDefaults.ini. If you don't change your OpenSimDefaults.ini, you will continue to see the arch problem.
* | Merge branch 'master' into careminsterMelanie2013-02-051-1/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Bump version and assembly version numbers from 0.7.5 to 0.7.6Justin Clark-Casey (justincc)2013-02-051-1/+1
| | | | | | | | | | | | | | | | This is mostly Bluewall's work but I am also bumping the general version number OpenSimulator 0.7.5 remains in the release candidate stage. I'm doing this because master is significantly adding things that will not be in 0.7.5 This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names and so the exact version match requirement is not in force.
* | Merge branch 'master' into careminsterMelanie2012-11-301-6/+17
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Physics/Manager/IMesher.cs
| * BulletSim: add expanded call to IMesher/Meshmerizer which enables/disables ↵Robert Adams2012-11-291-5/+16
| | | | | | | | mesh caching. Since BulletSim caches and tracks the unmanaged memory version of meshes, the Meshmerizer itself does not need to cache built meshes once BulletSim has made the physical proxy mesh.
* | Merge branch 'master' into careminsterMelanie2012-11-301-0/+3
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs OpenSim/Region/Physics/Meshing/Meshmerizer.cs
| * Stop logging spurious asset data for {0} is zero length error for sculpts/meshJustin Clark-Casey (justincc)2012-11-281-1/+4
| | | | | | | | | | | | | | | | ODEPrim, for instance, always hits this code path twice at the moment Firstly before any sculpt data has been loaded (hence the spurious message) Secondly when any sculpt data has been loaded or failed to load (when the message would be valid). Hence comment this out and rely on the message in ODEPrim.MeshAssetReceived() instead (though this is not ideal since it requires all physics plugins to copy/paste similar code).
* | Merge branch 'master' into careminsterMelanie2012-11-151-0/+33
|\ \ | |/
| * Added AssemblyInfos to every dll in the OpenSim.Region namespace.Diva Canto2012-11-141-0/+33
| |
* | add mesh cache expire on region startup. Expires will be relative toUbitUmarov2012-10-131-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 )UbitUmarov2012-10-092-1/+3
| |
* | refix so we can compile it, loosing alpha scultps fix on core meshmerizerUbitUmarov2012-10-071-0/+11
| |
* | fix wrong file commitedUbitUmarov2012-10-071-10/+0
| |
* | Merge branch 'avination' into ubitworkUbitUmarov2012-10-071-24/+7
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/Physics/Meshing/Meshmerizer.cs
| * | comment out a spam coment on core MeshmerizerUbitUmarov2012-10-071-26/+4
| | |
* | | more changes. Most code not in useUbitUmarov2012-10-041-0/+6
| | |
* | | introduce a ODEMeshWorker class, should be pure cosmetic changes for nowUbitUmarov2012-10-031-0/+5
|/ /
* | ** DANGER someone should stress test more ** release unused physics meshs, ↵UbitUmarov2012-08-061-0/+2
| | | | | | | | including unmanaged memory allocations (allocated by managed code)
* | Merge branch 'master' into careminsterMelanie2012-07-161-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 ↵dahlia2012-07-131-143/+183
| | | | | | | | sliced linear prims. Addresses Mantis #6085
* | Downgrade an error log message to info because there is nothing we can do ifMelanie2012-04-161-1/+1
| | | | | | | | an asset is damaged so it should not spew red ink.
* | Merge branch 'ubitwork'Melanie2012-03-201-0/+5
|\ \
| * | let convex be a parameter to createMesh so it can be used. Was forced to add ↵UbitUmarov2012-03-211-0/+5
| | | | | | | | | | | | it also to original mesher code and zeromesher
* | | Merge branch 'master' into careminsterMelanie2012-03-201-1/+1
|\ \ \ | |/ / |/| / | |/ | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Add prim name to "[MESH]: No recognized physics mesh..." log messageJustin Clark-Casey (justincc)2012-03-201-1/+1
| |
* | Merge branch 'ubitwork'Melanie2012-02-193-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 ↵UbitUmarov2012-02-113-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-161-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-291-9/+6
| | | | struct
* Move GetMeshKey from buried inside Meshmerizer to a public method on ↵Robert Adams2011-08-281-62/+1
| | | | | | PrimitiveBaseShape Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* Add level of detail specification to optionally reduce the number of ↵Robert Adams2011-08-281-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 dataJustin Clark-Casey (justincc)2011-07-301-117/+141
|
* refactor: extract code which generate points and faces from sculpt data into ↵Justin Clark-Casey (justincc)2011-07-301-220/+240
| | | | | | it's own method. fix build break.
* fix bug in previous commitJustin Clark-Casey (justincc)2011-07-301-1/+2
|
* refactor: move the code that generates physics meshs from prim mesh data ↵Justin Clark-Casey (justincc)2011-07-301-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-291-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 resizedJustin Clark-Casey (justincc)2011-07-161-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-111-1/+1
| | | | | | generation" message. Can probably comment out this message soon, once a few other issues are tidied up.
generated by cgit v1.1 at 2024-12-22 10:02:39 +0000