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

updated some prim parameters to project maintained versions

0.6.0-stable
Dahlia Trimble 2008-08-14 08:59:13 +00:00
parent e3157e61aa
commit 1bf60fa1ac
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/Physics/Meshing/Meshmerizer.cs
View File

@ -30,7 +30,6 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.Physics.Manager; using OpenSim.Region.Physics.Manager;
using libsecondlife;
namespace OpenSim.Region.Physics.Meshing namespace OpenSim.Region.Physics.Meshing
{ {
@ -1883,12 +1882,12 @@ namespace OpenSim.Region.Physics.Meshing
} }
else if ((primShape.ProfileCurve & 0x07) == (byte)ProfileShape.Square) else if ((primShape.ProfileCurve & 0x07) == (byte)ProfileShape.Square)
{ {
if (primShape.PathCurve == (byte)LLObject.PathCurve.Line) if (primShape.PathCurve == (byte)Extrusion.Straight)
{ // its a box { // its a box
mesh = CreateBoxMesh(primName, primShape, size); mesh = CreateBoxMesh(primName, primShape, size);
CalcNormals(mesh); CalcNormals(mesh);
} }
else if (primShape.PathCurve == (byte)LLObject.PathCurve.Circle) else if (primShape.PathCurve == (byte)Extrusion.Curve1)
{ // tube { // tube
// do a cylinder for now // do a cylinder for now
//mesh = CreateCylinderMesh(primName, primShape, size); //mesh = CreateCylinderMesh(primName, primShape, size);
@ -1904,9 +1903,8 @@ namespace OpenSim.Region.Physics.Meshing
CalcNormals(mesh); CalcNormals(mesh);
} }
// look at LLObject.cs in libsecondlife for how to know the prim type
// ProfileCurve seems to combine hole shape and profile curve so we need to only compare against the lower 3 bits // ProfileCurve seems to combine hole shape and profile curve so we need to only compare against the lower 3 bits
else if (primShape.PathCurve == (byte) Extrusion.Curve1 && LLObject.UnpackPathScale(primShape.PathScaleY) <= 0.75f) else if (primShape.PathCurve == (byte) Extrusion.Curve1)
{ // dahlia's favorite, a torus :) { // dahlia's favorite, a torus :)
mesh = CreateCircularPathMesh(primName, primShape, size); mesh = CreateCircularPathMesh(primName, primShape, size);
CalcNormals(mesh); CalcNormals(mesh);