Changeset 10039 for code/branches/turretFS14/data

Timestamp:

Apr 17, 2014, 4:05:06 PM (11 years ago)

Author:

muemart

Message:

Move logic into controller, don't use bullet for rotations, and use WorldPosition in FormationController+ (good idea?)

Location:

code/branches/turretFS14/data/levels

Files:

• templates/spaceshipAssff.oxt (modified) (2 diffs)
• turretTest.oxw (modified) (4 diffs)

code/branches/turretFS14/data/levels/templates/spaceshipAssff.oxt

@@ -49 +49 @@
       <BlinkingBillboard position="-17,-1.5,0" material="Examples/Flare" colour="0.5, 1.0, 0.3" amplitude=0.1 frequency=0.5 phase=180 quadratic=1 />
 
-              <Turret position="0,10,0" pitch="90" yaw="0" roll="0" maxPitch=90 maxYaw=90 attackRadius=2000>
+               <!-- <Turret position="0,10,0" pitch="90" yaw="0" roll="0" maxPitch=90 maxYaw=90 attackRadius=2000>
             <templates>
               <Template link=spaceshipturrettest />
@@ -56 +56 @@
               <TurretController team=10 />
             </controller>
-        </Turret>
+        </Turret> -->
 
     </attached>

code/branches/turretFS14/data/levels/turretTest.oxw

@@ -34 +34 @@
 
 
-<MovableEntity position="0,0,0" yaw=0 pitch=0>
+<SpaceShip position="-100,0,0" yaw=0 pitch=0>
     <attached>
         <Model position="0,0,0" mesh="turretSocketFront.mesh" scale3D="10,10,10" />
@@ -42 +42 @@
         <Model position="0,0,0" mesh="turretSocketRight.mesh" scale3D="10,10,10" />
 
-        <!-- <Turret position="0,10,0" pitch="90" yaw="0" roll="0" maxPitch=90 maxYaw=90 attackRadius=2000>
+        <Turret position="0,10,0" pitch="90" yaw="0" roll="0" maxPitch=90 maxYaw=90 attackRadius=2000>
             <templates>
               <Template link=spaceshipturrettest />
@@ -49 +49 @@
               <TurretController team=10 />
             </controller>
-        </Turret> -->
+        </Turret>
 
         <Model mesh="sphere.mesh" position="20,0,0" scale=1/>
@@ -58 +58 @@
 
     </attached>
-</MovableEntity>
+</SpaceShip>
 
+<SpaceShip position="100,0,0" yaw=0 pitch=0>
+    <attached>
+        <Model position="0,0,0" mesh="turretSocketFront.mesh" scale3D="10,10,10" />
+        <Model position="0,0,0" mesh="turretSocketIn.mesh" scale3D="10,10,10" />
+        <Model position="0,0,0" mesh="turretSocketTop.mesh" scale3D="10,10,10" />
+        <Model position="0,0,0" mesh="turretSocketLeft.mesh" scale3D="10,10,10" />
+        <Model position="0,0,0" mesh="turretSocketRight.mesh" scale3D="10,10,10" />
 
+        <Turret position="0,10,0" pitch="90" yaw="0" roll="0" maxPitch=90 maxYaw=90 attackRadius=2000>
+            <templates>
+              <Template link=spaceshipturrettest />
+            </templates>
+            <controller>
+              <TurretController team=9 />
+            </controller>
+        </Turret>
+
+        <Model mesh="sphere.mesh" position="20,0,0" scale=1/>
+
+        <Model mesh="sphere.mesh" position="0,25,0" scale=1/>
+
+        <Model mesh="sphere.mesh" position="0,0,30" scale=1/>
+
+    </attached>
+</SpaceShip>