Changeset 9489

Timestamp:

Dec 3, 2012, 5:46:12 PM (11 years ago)

Author:

moralelastix

Message:

What ever

Location:

code/branches/turret

Files:

• data/levels/includes/weaponSettingsTurret.oxi (added)
• data/levels/templates/lodInformation.oxt (modified) (1 diff)
• data/levels/templates/spaceshipTurret.oxt (added)
• data/levels/turretTest.oxw (modified) (3 diffs)
• src/modules/objects/Turret.cc (modified) (2 diffs)
• src/modules/objects/Turret.h (modified) (2 diffs)

code/branches/turret/data/levels/templates/lodInformation.oxt

@@ -15 +15 @@
       <MeshLodInformation mesh=CuboidLandingZone.mesh enabled=false/>
       <MeshLodInformation mesh=HydroHarvester.mesh enabled=false />
+      <MeshLodInformation mesh=turretHead.mesh enabled=false />
 
       <!-- disable LOD for some debris meshes which caused a crash (fixed in Ogre 1.7.3) -->

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

@@ -1 +1 @@
 <LevelInfo
  name = "turret Test"
- description = "A level with absolutely nothing in it."
+ description = "A level with a turret in it."
  tags = "test"
  screenshot = "emptylevel.png"
@@ -15 +15 @@
   include("templates/spaceshipAssff.oxt")
   include("templates/spaceshipPirate.oxt")
+  include("templates/spaceshipTurret.oxt")
 ?>
 
@@ -27 +28 @@
     skybox       = "Orxonox/Starbox"
   >
+    <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
+    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+
+
+<StaticEntity position="0,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" />
+    </attached>
+</StaticEntity>
 
 
 
-
-    <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
-    <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+<SpaceShip position="0,10,0" pitch="-45" yaw="225" roll="0">
+    <templates>
+        <Template link=spaceshipturret />
+    </templates>
+    <controller>
+        <WaypointPatrolController alertnessradius=100 team=10>
+        </WaypointPatrolController>
+     </controller>
+</SpaceShip>
     
   </Scene>

code/branches/turret/src/modules/objects/Turret.cc

@@ -39 +39 @@
      * @brief Constructor
      */
-    Turret::Turret(BaseObject* creator) : Pawn(creator)
+    Turret::Turret(BaseObject* creator) : SpaceShip(creator)
     {
         RegisterObject(Turret);
@@ -53 +53 @@
     }
 
-    /*void Turret::rotateYaw(const Vector2& value)
-    {
-
-    }
-
 
     void Turret::rotatePitch(const Vector2& value)
     {
-
+        Vector2 pitch = value;
+        float nextPitch = this->localAngularAcceleration_.x() + pitch.x*0.8f;
+        // Einschraenken auf 0 bis 180
+        this->localAngularAcceleration_.setX(nextPitch);
     }
 
-    void Turret::rotateRoll(const Vector2& value)
-    {
-
-    }*/
 
     void Turret::setAlertnessRadius(float value)

code/branches/turret/src/modules/objects/Turret.h

@@ -38 +38 @@
 #include "objects/ObjectsPrereqs.h"
 
-#include "worldentities/pawns/Pawn.h"
+#include "worldentities/pawns/SpaceShip.h"
 
 namespace orxonox
 {
-    class _ObjectsExport Turret : public Pawn
+    class _ObjectsExport Turret : public SpaceShip
     {
         public:
@@ -49 +49 @@
 
             //virtual void tick(float dt);
-            virtual void moveFrontBack(const Vector2& value) {}
-            virtual void moveRightLeft(const Vector2& value) {}
-            virtual void moveUpDown(const Vector2& value) {}
 
-            /*virtual void rotateYaw(const Vector2& value);
             virtual void rotatePitch(const Vector2& value);
-            virtual void rotateRoll(const Vector2& value);*/
 
             void setAlertnessRadius(float value);