aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | Add 'terrain feature' commandDev Random2014-11-191-2/+55
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | In TerrainModule, lock m_perClientPatchUpdates when removing entries.Justin Clark-Casey (justincc)2014-07-291-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This may have been the trigger CheckSendingPatchesToClients() dictionary out of sync exceptions in today's load test. Don't need to check ContainsKey() since Remove() returns false on a request to remove a key that it doesn't have
* | | | | | | | | | | | | | | | | | | | Set "[Terrain]SendTerrainUpdatesByViewDistance=true" by default.Robert Adams2014-07-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This, by default, enables terrain patches being sent to each avatar from the avatar away (rather than the old outside-in pattern), only sending terrain patches within the avatars view distance (making view loading quicker), and sending multiple terrain patches per protocol packet (making terrain loading and editing quicker).
* | | | | | | | | | | | | | | | | | | | Send multiple terrain patches per terrain update packet if terrainRobert Adams2014-06-011-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | draw distance optimization is enabled. Makes terrain editting a lot snappier.
* | | | | | | | | | | | | | | | | | | | Modifications to debugging printouts. No functional changes.Robert Adams2014-05-311-5/+8
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | varregion: More tweeking to only sending patches within avatar draw distance.Robert Adams2014-05-311-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Still has problems with child avatars.
* | | | | | | | | | | | | | | | | | | | varregion: send terrain patches from where the avatar outward if the parameterRobert Adams2014-05-311-33/+259
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Terrain]SendTerrainUpdatesByViewDistance=true. This tracks which patches have been sent to each client and outputs the patches as the avatar moves.
* | | | | | | | | | | | | | | | | | | | minor: Correct mistake in terrain flip error message from previous commit ↵Justin Clark-Casey (justincc)2014-04-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5d01a1f
* | | | | | | | | | | | | | | | | | | | minor: Print output in response to terrain console commands on the console ↵Justin Clark-Casey (justincc)2014-04-301-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rather than in the log.
* | | | | | | | | | | | | | | | | | | | Add "terrain show" console command which outputs terrain height for a given ↵Justin Clark-Casey (justincc)2014-04-301-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | region co-ordinate. For debug purposes.
* | | | | | | | | | | | | | | | | | | | BulletSim: non-functional changes to debugging statements and formatting.Robert Adams2014-04-281-2/+1
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Add regression test for terrain fill at two digit height and max ll height.Justin Clark-Casey (justincc)2014-04-251-1/+1
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Eliminated many warningsOren Hurvitz2014-04-231-1/+4
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | varregion: remove serialization of region terrain to floats when sending ↵Robert Adams2014-03-111-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | patches. This should eliminate much memory thrashing and CPU usage while sending initial terrain. The old way of passing terrain was to convert it to an array of floats. This is really bad for large terrain (think 4096x4096 floats). This change passes a dummy float array since the real region info is used anyway and the floats are ignored. (The ignoring the terrain floats is a kludge so as to not change IClientAPI.)
* | | | | | | | | | | | | | | | | | | | Change terrain update sending to be triggered by frame tick ratherRobert Adams2014-03-101-50/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | than everytime terrain is changed. The TerrainModule now hooks the frame event and, if terrain has changed, sends terrain updates to the clients. This polling pattern replaces the previous push on change pattern and will make it easier to do per client throttling and per scene presence terrain update ordering.
* | | | | | | | | | | | | | | | | | | | Implement terrain merging in TerrainChannel.Robert Adams2014-02-021-31/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify archiver to use terrain merging when loading oars. This makes displacement AND rotation properly work on terrain when loading oars. Especially useful when loading legacy region oars into large varregions.
* | | | | | | | | | | | | | | | | | | | varregion: add --displacement parameter to 'load oar'.Robert Adams2014-01-191-3/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds displacment to all objects and terrain loaded from the oar. As an example, if you have a 512x512 region and an old 256x256 oar, doing load oar --displacement "<128,128,0>" oarFile.oar will load the object (and terrain) into the middle of the 512x512 region. If displacement is not specified, 'load oar' works like it always has. If you have a 5
* | | | | | | | | | | | | | | | | | | | varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z.Robert Adams2013-12-141-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename 'RegionWorldLocX' to 'WorldLocX' and same for Y and Z. This keeps the downward compatibility and follows the scheme of 'region' and 'world' location naming that is happening in the Util module.
* | | | | | | | | | | | | | | | | | | | varregion: extend TerrainModule to use the region size from RegionInfoRobert Adams2013-11-101-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rather than using Constants.RegionSize. This allows loading and saving of terrain heightmaps that match the size of non-legacy sized regions.
* | | | | | | | | | | | | | | | | | | | varregion: move the compressed heighmap compression factor fromRobert Adams2013-10-161-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Constants into TerrainData. Save compression factor with the terrain blob in the database.
* | | | | | | | | | | | | | | | | | | | varregion: plug in TerrainData class and modify TerrainModule and ↵Robert Adams2013-10-071-13/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LLClientView to use same. This passes a terrain info class around rather than passing a one dimensional array thus allowing variable regions. Update the database storage for variable region sizes. This should be downward compatible (same format for 256x256 regions).
* | | | | | | | | | | | | | | | | | | | varregion: serious rework of TerrainChannel:Robert Adams2013-09-281-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -- addition of varaible region size in X and Y -- internal storage of heightmap changed from double[] to short[] -- helper routines for handling internal structure while keeping existing API -- to and from XML that adds region size information (for downward compatibility, output in the legacy XML format if X and Y are 256) Updated and commented Constants.RegionSize but didn't change the name for compatibility.
* | | | | | | | | | | | | | | | | | | | VarRegion: change RegionInfo storage of region coordinates from regionRobert Adams2013-09-281-5/+5
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | count number to integer world coordinates. Added new methods RegionWorldLoc[XY]. Refactored name of 'RegionLoc*' to 'LegacyRegionLoc*' throughout OpenSim. Kept old 'RegionLoc*' entrypoint to RegionInfo for downward compatability of external region management packages.
* | | | | | | | | | | | | | | | | | | minor: Change channel digger replacement message in TerrainModule to Info ↵Justin Clark-Casey (justincc)2013-01-031-1/+1
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from Warn. This is to stop this unnecessarily triggering log analysis code which reports warn and error level statements.
* | | | | | | | | | | | | | | | | | Another 10 modules' directives moved from .addin.xmlDiva Canto2012-11-121-0/+2
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Revert "Added request.Proxy=null everywhere, as discussed in ↵Diva Canto2012-09-301-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow." But the patch is here, in case anyone wants to try it. This reverts commit 531edd51d82ecd6a842a2611c99e9919634491ef.
* | | | | | | | | | | | | | | | | | Added request.Proxy=null everywhere, as discussed in ↵Diva Canto2012-09-301-0/+1
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow. Thanks R.Gunther (rigun@rigutech.nl) https://lists.berlios.de/pipermail/opensim-users/2012-September/010986.html
* | | | | | | | | | | | | | | | | formattingSignpostMarv2012-08-271-22/+22
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | refactoring to load from self (fixes ChanneDigger being absent)SignpostMarv2012-08-271-5/+11
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | refactoring to assign the first argument to a variableSignpostMarv2012-08-271-4/+5
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | porting console commands from raw2sculpt 3.2SignpostMarv2012-07-051-0/+34
| |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Add even for terrain tainting and synchronize terrain module with physics ↵Dan Lake2012-05-101-0/+1
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scene before physics simulation step rather than after
* | | | | | | | | | | | | | terrain save-tile extensions Signed-off-by: Garmin Kawaguichi ↵Garmin Kawaguichi2012-04-031-3/+15
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <garmin.kawaguichi@magalaxie.com> Signed-off-by: Melanie <melanie@t-data.com>
* | | | | | | | | | | | | In TerrainModule.cs, the command terrain save-tile is modified to remove an ↵Garmin Kawaguichi2012-03-271-2/+0
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unnecessary double argument "minimum Y tile"
* | | | | | | | | | | | Hack example on to "terrain save-tile" extended help.Justin Clark-Casey (justincc)2012-03-241-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to Garmin Kawaguichi for the initially suggested text.
* | | | | | | | | | | | Give feedback when "terrain save-tile" is not successfully invoked.Justin Clark-Casey (justincc)2012-03-241-30/+37
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | Comment out a terrain save-tile debugging message that accidentally crept in ↵Justin Clark-Casey (justincc)2012-03-221-6/+6
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | with c4b2d24
* | | | | | | | | | Add llGiveInventory() test from object to object where both objects are ↵Justin Clark-Casey (justincc)2012-03-221-0/+6
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | owned by the same user.
* | | | | | | | | Terrain: added [Terrain] section with an option to load an initial flat ↵Diva Canto2012-03-161-1/+6
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | terrain. Default is still pinhead island. I much rather have a flat land in the beginning.
* | | | | | | | For TerrainModule.SaveToFile(), don't bother throwing the exception onwards ↵Justin Clark-Casey (justincc)2011-11-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after printing out the error, since this method is invoked by users. Still throwing the exception on the stream method since this invoked programatically
* | | | | | | | Make "terrain save" more friendly by telling the user if we have saved and ↵Justin Clark-Casey (justincc)2011-11-171-18/+32
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | putting out a useful complaint message if we haven't for some reason
* | | | | | | use standard sdk stack in terrain model rather than OpenSim.Framework.UndoStack.Justin Clark-Casey (justincc)2011-07-181-1/+1
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | remove OpenSim.Framework.UndoStack
* | | | | | Implemented terrain save-tile command. Does the opposite of load-tile. For ↵Diva Canto2011-04-121-0/+54
| |_|_|_|/ |/| | | | | | | | | | | | | | now, only saves to .png.
* | | | | Display supported file extensions/formats in "terrain load help" (Mantis #5349)Kevin Cozens2011-01-281-2/+8
| |_|_|/ |/| | |
* | | | Formatting cleanup.Jeff Ames2010-09-121-1/+1
| |_|/ |/| |
* | | refactor: move Scene.TerrainUnAcked() handling into TerrainModuleJustin Clark-Casey (justincc)2010-08-131-1/+8
| |/ |/|
* | store terrain module trying to load plugins if plugin path does not existJustin Clark-Casey (justincc)2010-07-301-2/+7
|/
* Revolution is on the roll again! :)Revolution2010-02-141-0/+41
| | | | | | | | 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>
* Allow terrain heightmaps to be loaded directly from URIs via the remote ↵Justin Clark-Casey (justincc)2009-12-041-1/+31
| | | | | | | | admin plugin See http://opensimulator.org/mantis/view.php?id=4418 Thanks StrawberryFride See
* Replace the Replaceable modules nameMelanie2009-08-101-1/+1
|