aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Examples/SimpleApp
diff options
context:
space:
mode:
authorlbsa712007-08-15 18:02:05 +0000
committerlbsa712007-08-15 18:02:05 +0000
commita4602515ce5dd50b7391269f2c706269d4ec833f (patch)
tree8c233ea04dd843f0242f5d7bdc20fa34d3bba405 /OpenSim/Region/Examples/SimpleApp
parent* Again, FileSystemObject reports filename. (diff)
downloadopensim-SC_OLD-a4602515ce5dd50b7391269f2c706269d4ec833f.zip
opensim-SC_OLD-a4602515ce5dd50b7391269f2c706269d4ec833f.tar.gz
opensim-SC_OLD-a4602515ce5dd50b7391269f2c706269d4ec833f.tar.bz2
opensim-SC_OLD-a4602515ce5dd50b7391269f2c706269d4ec833f.tar.xz
* Added more spinning parts to ComplexObject.
* We now have CylinderShape * This commit dedicated to the birth of techno house.
Diffstat (limited to 'OpenSim/Region/Examples/SimpleApp')
-rw-r--r--OpenSim/Region/Examples/SimpleApp/ComplexObject.cs19
1 files changed, 13 insertions, 6 deletions
diff --git a/OpenSim/Region/Examples/SimpleApp/ComplexObject.cs b/OpenSim/Region/Examples/SimpleApp/ComplexObject.cs
index b21e4aa..b1da33a 100644
--- a/OpenSim/Region/Examples/SimpleApp/ComplexObject.cs
+++ b/OpenSim/Region/Examples/SimpleApp/ComplexObject.cs
@@ -14,11 +14,12 @@ namespace SimpleApp
14 14
15 private class RotatingWheel : SceneObjectPart 15 private class RotatingWheel : SceneObjectPart
16 { 16 {
17 private static LLQuaternion m_rotationDirection = new LLQuaternion(0.05f, 0, 0); 17 private LLQuaternion m_rotationDirection;
18 18
19 public RotatingWheel(ulong regionHandle, SceneObjectGroup parent, LLUUID ownerID, uint localID, LLVector3 groupPosition, LLVector3 offsetPosition) 19 public RotatingWheel(ulong regionHandle, SceneObjectGroup parent, LLUUID ownerID, uint localID, LLVector3 groupPosition, LLVector3 offsetPosition, LLQuaternion rotationDirection)
20 : base(regionHandle, parent, ownerID, localID, BoxShape.Default, groupPosition, offsetPosition ) 20 : base(regionHandle, parent, ownerID, localID, new CylinderShape( 0.5f, 0.2f ), groupPosition, offsetPosition )
21 { 21 {
22 m_rotationDirection = rotationDirection;
22 } 23 }
23 24
24 public override void UpdateMovement() 25 public override void UpdateMovement()
@@ -38,10 +39,16 @@ namespace SimpleApp
38 : base(scene, regionHandle, ownerID, localID, pos, BoxShape.Default ) 39 : base(scene, regionHandle, ownerID, localID, pos, BoxShape.Default )
39 { 40 {
40 m_rotationDirection = new LLQuaternion(0.05f, 0.1f, 0.15f); 41 m_rotationDirection = new LLQuaternion(0.05f, 0.1f, 0.15f);
41
42 AddPart(new RotatingWheel(regionHandle, this, ownerID, scene.PrimIDAllocate(), pos, new LLVector3(0, 0, 1f)));
43 AddPart(new RotatingWheel(regionHandle, this, ownerID, scene.PrimIDAllocate(), pos, new LLVector3(0, 0, -1f)));
44 42
43 AddPart(new RotatingWheel(regionHandle, this, ownerID, scene.PrimIDAllocate(), pos, new LLVector3(0, 0, 0.75f), new LLQuaternion(0.05f,0,0)));
44 AddPart(new RotatingWheel(regionHandle, this, ownerID, scene.PrimIDAllocate(), pos, new LLVector3(0, 0, -0.75f), new LLQuaternion(-0.05f,0,0)));
45
46 AddPart(new RotatingWheel(regionHandle, this, ownerID, scene.PrimIDAllocate(), pos, new LLVector3(0, 0.75f,0), new LLQuaternion(0.5f, 0, 0.05f)));
47 AddPart(new RotatingWheel(regionHandle, this, ownerID, scene.PrimIDAllocate(), pos, new LLVector3(0, -0.75f,0), new LLQuaternion(-0.5f, 0, -0.05f)));
48
49 AddPart(new RotatingWheel(regionHandle, this, ownerID, scene.PrimIDAllocate(), pos, new LLVector3(0.75f, 0, 0), new LLQuaternion(0, 0.5f, 0.05f)));
50 AddPart(new RotatingWheel(regionHandle, this, ownerID, scene.PrimIDAllocate(), pos, new LLVector3(-0.75f, 0, 0), new LLQuaternion(0, -0.5f, -0.05f)));
51
45 UpdateParentIDs(); 52 UpdateParentIDs();
46 } 53 }
47 } 54 }