diff options
author | Charles Krinke | 2008-10-25 14:07:35 +0000 |
---|---|---|
committer | Charles Krinke | 2008-10-25 14:07:35 +0000 |
commit | 4e14aa44c7b7ed9564dd34d797b8a4d577bba684 (patch) | |
tree | b17170a6cdba7bd9b1d49cf7d068d044d88db24e /OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/LowerSphere.cs | |
parent | A few more bots to yesterday's plumbing: change instant message method (diff) | |
download | opensim-SC_OLD-4e14aa44c7b7ed9564dd34d797b8a4d577bba684.zip opensim-SC_OLD-4e14aa44c7b7ed9564dd34d797b8a4d577bba684.tar.gz opensim-SC_OLD-4e14aa44c7b7ed9564dd34d797b8a4d577bba684.tar.bz2 opensim-SC_OLD-4e14aa44c7b7ed9564dd34d797b8a4d577bba684.tar.xz |
Thank you kindly, Tglion for a patch that:
Support of strength-slider in latest sl-client (1.21.6)
Added a patch, which includes the support of strength-slider
in latest sl-client (1.21.6) for Raise- and LowerSphere.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/LowerSphere.cs')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/LowerSphere.cs | 36 |
1 files changed, 25 insertions, 11 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/LowerSphere.cs b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/LowerSphere.cs index fe82396..290711f 100644 --- a/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/LowerSphere.cs +++ b/OpenSim/Region/Environment/Modules/World/Terrain/PaintBrushes/LowerSphere.cs | |||
@@ -36,29 +36,43 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain.PaintBrushes | |||
36 | 36 | ||
37 | public void PaintEffect(ITerrainChannel map, bool[,] mask, double rx, double ry, double rz, double strength, double duration) | 37 | public void PaintEffect(ITerrainChannel map, bool[,] mask, double rx, double ry, double rz, double strength, double duration) |
38 | { | 38 | { |
39 | strength = TerrainUtil.MetersToSphericalStrength(strength); | 39 | int s = (int) (Math.Pow(2, strength) + 0.5); |
40 | duration = 0.03; //MCP Should be read from ini file | 40 | |
41 | |||
42 | int x; | 41 | int x; |
43 | for (x = 0; x < map.Width; x++) | 42 | int xFrom = (int)(rx-s+0.5); |
43 | int xTo = (int)(rx+s+0.5) + 1; | ||
44 | int yFrom = (int)(ry-s+0.5); | ||
45 | int yTo = (int)(ry+s+0.5) + 1; | ||
46 | |||
47 | if (xFrom < 0) | ||
48 | xFrom = 0; | ||
49 | |||
50 | if (yFrom < 0) | ||
51 | yFrom = 0; | ||
52 | |||
53 | if (xTo > map.Width) | ||
54 | xTo = map.Width; | ||
55 | |||
56 | if (yTo > map.Width) | ||
57 | yTo = map.Width; | ||
58 | |||
59 | for (x = xFrom; x < xTo; x++) | ||
44 | { | 60 | { |
45 | int y; | 61 | int y; |
46 | for (y = 0; y < map.Height; y++) | 62 | for (y = yFrom; y <= yTo; y++) |
47 | { | 63 | { |
48 | if (!mask[x,y]) | 64 | if (!mask[x,y]) |
49 | continue; | 65 | continue; |
50 | 66 | ||
51 | // Calculate a sphere and add it to the heighmap | 67 | // Calculate a cos-sphere and add it to the heighmap |
52 | double z = strength; | 68 | double r = Math.Sqrt((x-rx) * (x-rx) + ((y-ry) * (y-ry))); |
53 | z *= z; | 69 | double z = Math.Cos(r * Math.PI / (s * 2)); |
54 | z -= ((x - rx) * (x - rx)) + ((y - ry) * (y - ry)); | ||
55 | |||
56 | if (z > 0.0) | 70 | if (z > 0.0) |
57 | map[x, y] -= z * duration; | 71 | map[x, y] -= z * duration; |
58 | } | 72 | } |
59 | } | 73 | } |
60 | } | ||
61 | 74 | ||
75 | } | ||
62 | #endregion | 76 | #endregion |
63 | } | 77 | } |
64 | } | 78 | } |