Changeset 668 for code/branches/FICN/src/orxonox
- Timestamp:
- Dec 22, 2007, 4:35:17 PM (17 years ago)
- Location:
- code/branches/FICN/src/orxonox
- Files:
-
- 10 added
- 14 deleted
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/FICN/src/orxonox/Main.cc
r666 r668 72 72 73 73 #if OGRE_PLATFORM == OGRE_PLATFORM_WIN32 74 #ifndef WIN32_LEAN_AND_MEAN 74 75 #define WIN32_LEAN_AND_MEAN 76 #endif 75 77 #include "windows.h" 76 78 INT WINAPI WinMain(HINSTANCE hInst, HINSTANCE, LPSTR strCmdLine, INT) -
code/branches/FICN/src/orxonox/core/ArgReader.cc
r543 r668 83 83 if(argpos != 0) 84 84 { 85 floating = atof(arguments_[argpos]);85 floating = (float)atof(arguments_[argpos]); 86 86 } 87 87 else -
code/branches/FICN/src/orxonox/core/Identifier.cc
r513 r668 100 100 COUT(1) << "Aborting..."; 101 101 abort(); 102 return NULL; 102 103 } 103 104 } -
code/branches/FICN/src/orxonox/hud/HUD.cc
r660 r668 1 /* 2 * ORXONOX - the hottest 3D action shooter ever to exist 3 * 4 * 5 * License notice: 6 * 7 * This program is free software; you can redistribute it and/or 8 * modify it under the terms of the GNU General Public License 9 * as published by the Free Software Foundation; either version 2 10 * of the License, or (at your option) any later version. 11 * 12 * This program is distributed in the hope that it will be useful, 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * GNU General Public License for more details. 16 * 17 * You should have received a copy of the GNU General Public License 18 * along with this program; if not, write to the Free Software 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 20 * 21 * Author: 22 * Yuning Chai 23 * Co-authors: 24 * ... 25 * 26 */ 27 28 #include <OgreOverlayManager.h> 29 #include <OgreOverlayElement.h> 30 #include <OgreStringConverter.h> 31 1 32 #include "HUD.h" 2 // #include <Ogre.h> 3 // #include <OIS/OIS.h> 4 //#include <CEGUI/CEGUI.h> 5 //#include <CEGUIRenderer.h> 6 7 8 using namespace Ogre; 33 9 34 10 35 namespace hud { 11 HUD::HUD( void ) { 12 36 using namespace Ogre; 37 38 HUD::HUD(void) 39 { 13 40 init(); 14 41 … … 184 211 185 212 primarChoice_ = OverlayManager::getSingleton().getOverlayElement("Orxonox/HUD1.2/PrimarChoice"); 186 187 188 } 189 213 } 190 214 191 215 } -
code/branches/FICN/src/orxonox/hud/HUD.h
r659 r668 1 /* 2 * ORXONOX - the hottest 3D action shooter ever to exist 3 * 4 * 5 * License notice: 6 * 7 * This program is free software; you can redistribute it and/or 8 * modify it under the terms of the GNU General Public License 9 * as published by the Free Software Foundation; either version 2 10 * of the License, or (at your option) any later version. 11 * 12 * This program is distributed in the hope that it will be useful, 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * GNU General Public License for more details. 16 * 17 * You should have received a copy of the GNU General Public License 18 * along with this program; if not, write to the Free Software 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 20 * 21 * Author: 22 * Yuning Chai 23 * Co-authors: 24 * ... 25 * 26 */ 27 1 28 #ifndef MODULE_HUD_H 2 29 #define MODULE_HUD_H 3 30 4 // #include <Ogre.h> 5 // #include <OIS/OIS.h> 6 //#include <CEGUI/CEGUI.h> 7 //#include <CEGUIRenderer.h> 8 #include <OgreOverlayManager.h> 9 #include <OgreOverlayElement.h> 10 #include <OgreStringConverter.h> 31 #include <OgrePrerequisites.h> 32 33 //#include "../OrxonoxPrereqs.h" 11 34 12 35 13 namespace hud 14 { 36 namespace hud { 37 class HUD { 38 private: 39 Ogre::OverlayElement* timeText_; 40 Ogre::OverlayElement* targetWindowNameText_; 41 Ogre::OverlayElement* targetWindowStatusText_; 42 Ogre::OverlayElement* targetWindowDistanceText_; 43 Ogre::OverlayElement* targetWindowHitRatingText_; 44 Ogre::OverlayElement* energyLength_; 45 Ogre::OverlayElement* shieldLeftTop_; 46 Ogre::OverlayElement* shieldRightTop_; 47 Ogre::OverlayElement* shieldLeftBottom_; 48 Ogre::OverlayElement* shieldRightBottom_; 49 Ogre::OverlayElement* rocketNum1_; 50 Ogre::OverlayElement* rocketNum2_; 51 Ogre::OverlayElement* rocketNum3_; 52 Ogre::OverlayElement* rocketNum4_; 53 Ogre::OverlayElement* energyDistrPoint_; 54 Ogre::OverlayElement* primarChoice_; 15 55 16 class HUD 17 { 56 int timeMin_; 57 int timeSec_; 18 58 19 private: 59 Ogre::String targetWindowName_; 60 Ogre::String targetWindowStatus_; 61 int targetWindowDistance_; 62 int targetWindowHitRating_; 20 63 21 Ogre::OverlayElement* timeText_; 22 Ogre::OverlayElement* targetWindowNameText_; 23 Ogre::OverlayElement* targetWindowStatusText_; 24 Ogre::OverlayElement* targetWindowDistanceText_; 25 Ogre::OverlayElement* targetWindowHitRatingText_; 26 Ogre::OverlayElement* energyLength_; 27 Ogre::OverlayElement* shieldLeftTop_; 28 Ogre::OverlayElement* shieldRightTop_; 29 Ogre::OverlayElement* shieldLeftBottom_; 30 Ogre::OverlayElement* shieldRightBottom_; 31 Ogre::OverlayElement* rocketNum1_; 32 Ogre::OverlayElement* rocketNum2_; 33 Ogre::OverlayElement* rocketNum3_; 34 Ogre::OverlayElement* rocketNum4_; 35 Ogre::OverlayElement* energyDistrPoint_; 36 Ogre::OverlayElement* primarChoice_; 64 int energyValue_; 37 65 38 int timeMin_; 39 int timeSec_; 66 bool shieldLeftTopValue_; 67 bool shieldRightTopValue_; 68 bool shieldLeftBottomValue_; 69 bool shieldRightBottomValue_; 40 70 41 Ogre::String targetWindowName_;42 Ogre::String targetWindowStatus_;43 int targetWindowDistance_;44 int targetWindowHitRating_;71 int rocket1_; 72 int rocket2_; 73 int rocket3_; 74 int rocket4_; 45 75 46 int energyValue_; 76 float energyDistrShield_; 77 float energyDistrEngine_; 78 float energyDistrLaser_; 47 79 48 bool shieldLeftTopValue_; 49 bool shieldRightTopValue_; 50 bool shieldLeftBottomValue_; 51 bool shieldRightBottomValue_; 80 float energyDistrPixelX_; 81 float energyDistrPixelY_; 52 82 53 int rocket1_; 54 int rocket2_; 55 int rocket3_; 56 int rocket4_; 57 58 float energyDistrShield_; 59 float energyDistrEngine_; 60 float energyDistrLaser_; 61 62 float energyDistrPixelX_; 63 float energyDistrPixelY_; 64 65 int primarValue_; 83 int primarValue_; 66 84 67 85 public: 68 HUD( void );69 ~HUD( void );70 void init( void );86 HUD( void ); 87 ~HUD( void ); 88 void init( void ); 71 89 72 void setTime(int i, int j);73 void setTargetWindowName(Ogre::String i);74 void setTargetWindowStatus(Ogre::String i);75 void setTargetWindowDistance(int i);76 void setTargetWindowHitRating(int i);77 void setEnergyValue(int i);78 void setShieldLeftTopValue(bool i);79 void setShieldRightTopValue(bool i);80 void setShieldLeftBottomValue(bool i);81 void setShieldRightBottomValue(bool i);82 void setRocket1(int i);83 void setRocket2(int i);84 void setRocket3(int i);85 void setRocket4(int i);86 void setEnergyDistr(float s, float e, float l);87 void setPrimar(int i);90 void setTime(int i, int j); 91 void setTargetWindowName(Ogre::String i); 92 void setTargetWindowStatus(Ogre::String i); 93 void setTargetWindowDistance(int i); 94 void setTargetWindowHitRating(int i); 95 void setEnergyValue(int i); 96 void setShieldLeftTopValue(bool i); 97 void setShieldRightTopValue(bool i); 98 void setShieldLeftBottomValue(bool i); 99 void setShieldRightBottomValue(bool i); 100 void setRocket1(int i); 101 void setRocket2(int i); 102 void setRocket3(int i); 103 void setRocket4(int i); 104 void setEnergyDistr(float s, float e, float l); 105 void setPrimar(int i); 88 106 89 }; 107 }; 108 } 90 109 91 }92 110 #endif -
code/branches/FICN/src/orxonox/objects/Fighter.cc
r650 r668 32 32 #include "../core/CoreIncludes.h" 33 33 #include "../Orxonox.h" 34 #include "weapon_system/ ammunition_dump.h"35 #include "weapon_system/ barrel_gun.h"34 #include "weapon_system/AmmunitionDump.h" 35 #include "weapon_system/BarrelGun.h" 36 36 37 37 #include "OgreCamera.h"
Note: See TracChangeset
for help on using the changeset viewer.