OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

change strange rotation in legacy MapImageModule (untested)

LSLKeyTest
UbitUmarov 2016-08-22 20:43:11 +01:00
parent 133fce98e7
commit 08c1dff86c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
View File

@ -382,7 +382,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
Vector3 pos = part.GetWorldPosition(); Vector3 pos = part.GetWorldPosition();
// skip prim outside of retion // skip prim outside of region
if (!m_scene.PositionIsInCurrentRegion(pos)) if (!m_scene.PositionIsInCurrentRegion(pos))
continue; continue;
@ -406,12 +406,13 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
{ {
// Translate scale by rotation so scale is represented properly when object is rotated // Translate scale by rotation so scale is represented properly when object is rotated
Vector3 lscale = new Vector3(part.Shape.Scale.X, part.Shape.Scale.Y, part.Shape.Scale.Z); Vector3 lscale = new Vector3(part.Shape.Scale.X, part.Shape.Scale.Y, part.Shape.Scale.Z);
lscale *= 0.5f;
Vector3 scale = new Vector3(); Vector3 scale = new Vector3();
Vector3 tScale = new Vector3(); Vector3 tScale = new Vector3();
Vector3 axPos = new Vector3(pos.X, pos.Y, pos.Z); Vector3 axPos = new Vector3(pos.X, pos.Y, pos.Z);
Quaternion llrot = part.GetWorldRotation(); Quaternion rot = part.GetWorldRotation();
Quaternion rot = new Quaternion(llrot.W, llrot.X, llrot.Y, llrot.Z);
scale = lscale * rot; scale = lscale * rot;
// negative scales don't work in this situation // negative scales don't work in this situation
@ -470,7 +471,6 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
tScale = new Vector3(lscale.X, -lscale.Y, -lscale.Z); tScale = new Vector3(lscale.X, -lscale.Y, -lscale.Z);
scale = ((tScale * rot)); scale = ((tScale * rot));
vertexes[2] = (new Vector3((pos.X + scale.X), (pos.Y + scale.Y), (pos.Z + scale.Z))); vertexes[2] = (new Vector3((pos.X + scale.X), (pos.Y + scale.Y), (pos.Z + scale.Z)));
//vertexes[2].x = pos.X + vertexes[2].x; //vertexes[2].x = pos.X + vertexes[2].x;