Changeset 1855 for code/branches

Timestamp:

Sep 28, 2008, 7:10:08 PM (16 years ago)

Author:

rgrieder

Message:

TutorialShip should now do basic stuff.

Location:

code/branches/orxonox_tutorial

Files:

• src/orxonox/OrxonoxPrereqs.h (modified) (1 diff)
• src/orxonox/OrxonoxStableHeaders.h (modified) (1 diff)
• src/orxonox/gamestates/GSLevel.cc (modified) (1 diff)
• src/orxonox/objects/SpaceShip.cc (modified) (5 diffs)
• src/orxonox/objects/SpaceShip.h (modified) (1 diff)
• src/orxonox/objects/TutorialShip.cc (modified) (5 diffs)
• src/orxonox/objects/TutorialShip.h (modified) (2 diffs)
• visual_studio/vc8/orxonox.vcproj (modified) (1 diff)

code/branches/orxonox_tutorial/src/orxonox/OrxonoxPrereqs.h

@@ -90 +90 @@
     class SpaceShip;
     class SpaceShipAI;
+    class TutorialShip;
     class WorldEntity;
 

code/branches/orxonox_tutorial/src/orxonox/OrxonoxStableHeaders.h

@@ -37 +37 @@
 #include "util/OrxonoxPlatform.h"
 
-#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC && !defined(ORXONOX_DISABLE_PCH)
+#if ORXONOX_COMPILER == ORXONOX_COMPILER_MSVC && !defined(ORXONOX_DISABLE_PCH) && 0
 
 // including std headers here is useless since they're already precompiled

code/branches/orxonox_tutorial/src/orxonox/gamestates/GSLevel.cc

@@ -136 +136 @@
         // call the loader
         COUT(0) << "Loading level..." << std::endl;
-        startLevel_ = new Level(Settings::getDataPath() + "levels/sample.oxw");
+        startLevel_ = new Level(Settings::getDataPath() + "levels/tutorial.oxw");
         Loader::open(startLevel_);
     }

code/branches/orxonox_tutorial/src/orxonox/objects/SpaceShip.cc

@@ -64 +64 @@
     SetConsoleCommand(SpaceShip, movePitch, true).accessLevel(AccessLevel::User).defaultValue(0, 1.0f).axisParamIndex(0).keybindMode(KeybindMode::OnHold);
     SetConsoleCommand(SpaceShip, moveRoll, true).accessLevel(AccessLevel::User).defaultValue(0, 1.0f).axisParamIndex(0).keybindMode(KeybindMode::OnHold);
-    SetConsoleCommand(SpaceShip, fire, true).accessLevel(AccessLevel::User).keybindMode(KeybindMode::OnHold);
+    //SetConsoleCommand(SpaceShip, fire, true).accessLevel(AccessLevel::User).keybindMode(KeybindMode::OnHold);
     SetConsoleCommandAliasMulti(SpaceShip, setMaxSpeedTest, "setMaxSpeed", 1, false).accessLevel(AccessLevel::Debug);
     SetConsoleCommandAliasMulti(SpaceShip, setMaxSpeedTest, "setMaxBlubber", 2, false).accessLevel(AccessLevel::Debug);
@@ -258 +258 @@
 
             // START CREATING ADDITIONAL EFFECTS
-            /*this->backlight_ = new Backlight(this->maxSpeed_, 0.8);
-            this->attachObject(this->backlight_);
-            this->backlight_->setPosition(-2.35, 0, 0.2);
-            this->backlight_->setColour(this->getProjectileColour());
-
-            this->smoke_ = new ParticleSpawner();
-            this->smoke_->setParticle("Orxonox/smoke5", LODParticle::normal, 0, 0, 3);
-            this->attachObject(this->smoke_);
-
-            this->fire_ = new ParticleSpawner();
-            this->fire_->setParticle("Orxonox/fire3", LODParticle::normal, 0, 0, 1);
-            this->attachObject(this->fire_);
-            */
+            if (this->hasSpecialEffects())
+            {
+                this->backlight_ = new Backlight(this->maxSpeed_, 0.8);
+                this->attachObject(this->backlight_);
+                this->backlight_->setPosition(-2.35, 0, 0.2);
+                this->backlight_->setColour(this->getProjectileColour());
+
+                this->smoke_ = new ParticleSpawner();
+                this->smoke_->setParticle("Orxonox/smoke5", LODParticle::normal, 0, 0, 3);
+                this->attachObject(this->smoke_);
+
+                this->fire_ = new ParticleSpawner();
+                this->fire_->setParticle("Orxonox/fire3", LODParticle::normal, 0, 0, 1);
+                this->attachObject(this->fire_);
+            }
             // END CREATING ADDITIONAL EFFECTS
 
-            if (this->isExactlyA(Class(SpaceShip)))
+            if (!this->isExactlyA(Class(SpaceShipAI)))
             {
                 // START of testing crosshair
@@ -300 +302 @@
     {
         SetConfigValue(bInvertYAxis_, false).description("Set this to true for joystick-like mouse behaviour (mouse up = ship down).");
-        SetConfigValue(reloadTime_, 0.125).description("The reload time of the weapon in seconds");
+        //SetConfigValue(reloadTime_, 0.125).description("The reload time of the weapon in seconds");
+        reloadTime_ = 9999999.9f;
         SetConfigValue(testvector_, Vector3()).description("asdfblah");
     }
@@ -376 +379 @@
         COUT(4) << "requesting focus for camera" << std::endl;
         //CameraHandler::getInstance()->requestFocus(cam_);
-        if(this->isExactlyA(Class(SpaceShip))){
+        if(!this->isExactlyA(Class(SpaceShipAI))){
           getFocus();
           COUT(4) << "getting focus for obj id: " << objectID << std::endl;
@@ -484 +487 @@
 
             projectile->setObjectMode(0x3);
-            this->timeToReload_ = this->reloadTime_;
+            this->timeToReload_ = this->getReloadTime();
         }
 

code/branches/orxonox_tutorial/src/orxonox/objects/SpaceShip.h

@@ -98 +98 @@
             void setMoveLateral(float value);
             void doFire();
+            
+            virtual float getReloadTime() { return this->reloadTime_; }
+            virtual bool hasSpecialEffects() { return false; }
 
             inline const Vector3& getDir() const

code/branches/orxonox_tutorial/src/orxonox/objects/TutorialShip.cc

@@ -45 +45 @@
 namespace orxonox
 {
-    SetConsoleCommand(TutorialShip, fire, true);
+    SetConsoleCommand(TutorialShip, fire, true).keybindMode(KeybindMode::OnHold);
+
+    CreateFactory(TutorialShip);
 
     TutorialShip::TutorialShip()
@@ -52 +54 @@
 
         // reset variables
+        this->hasSpecialEffects_ = false;
+
+        // set config values
+        this->setConfigValues();
     }
 
@@ -65 +71 @@
     void TutorialShip::setConfigValues()
     {
-        //SetConfigValue(bInvertYAxis_, false).description("Set this to true for joystick-like mouse behaviour (mouse up = ship down).");
-        //SetConfigValue(reloadTime_, 0.125).description("The reload time of the weapon in seconds");
-        //SetConfigValue(testvector_, Vector3()).description("asdfblah");
+        SetConfigValue(reloadTime_, 0.125).description("The reload time of the weapon in seconds");
     }
 
-    void TutorialShip::registerAllVariables()
-    {
-    }
+    //void TutorialShip::registerAllVariables()
+    //{
+    //}
     
     /**
@@ -82 +86 @@
     void TutorialShip::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {
+        XMLPortParam(TutorialShip, "specialEffects", setSpecialEffects, hasSpecialEffects, xmlelement, mode);
+
+        // Calls SpaceShip::XMLPort
         SUPER(TutorialShip, XMLPort, xmlelement, mode);
+    }
 
-        //XMLPortParam(SpaceShip, "camera", setCamera, getCamera, xmlelement, mode);
+    bool TutorialShip::hasSpecialEffects()
+    {
+        return this->hasSpecialEffects_;
+    }
+
+    void TutorialShip::setSpecialEffects(bool value)
+    {
+        this->hasSpecialEffects_ = value;
+    }
+
+    /**
+        @brief Returns the weapon reload time. Used virtually by the base class.
+    */
+    float TutorialShip::getReloadTime()
+    {
+        return this->reloadTime_;
     }
 
@@ -95 +118 @@
     void TutorialShip::fire()
     {
+        SpaceShip::getLocalShip()->doFire();
     }
 }

code/branches/orxonox_tutorial/src/orxonox/objects/TutorialShip.h

@@ -50 +50 @@
 
             bool create();
-            void registerAllVariables();
+            //void registerAllVariables();
             void setConfigValues();
             void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             void tick(float dt);
+            float getReloadTime();
+
+            // XML parameter loading
+            bool hasSpecialEffects();
+            void setSpecialEffects(bool value);
 
             // Methods for console commands
@@ -59 +64 @@
 
         private:
+            float reloadTime_;
+            bool hasSpecialEffects_;
     };
 }

code/branches/orxonox_tutorial/visual_studio/vc8/orxonox.vcproj

@@ -292 +292 @@
                                 </File>
                                 <File
-                                        RelativePath="..\..\src\orxonox\objects\SpaceShip_backend.cc"
-                                        >
-                                        <FileConfiguration
-                                                Name="Debug|Win32"
-                                                ExcludedFromBuild="true"
-                                                >
-                                                <Tool
-                                                        Name="VCCLCompilerTool"
-                                                />
-                                        </FileConfiguration>
-                                        <FileConfiguration
-                                                Name="Release|Win32"
-                                                ExcludedFromBuild="true"
-                                                >
-                                                <Tool
-                                                        Name="VCCLCompilerTool"
-                                                />
-                                        </FileConfiguration>
-                                </File>
-                                <File
                                         RelativePath="..\..\src\orxonox\objects\SpaceShipAI.cc"
                                         >