Changeset 136 for code/branches

Timestamp:

Oct 31, 2007, 10:53:51 PM (17 years ago)

Author:

rgrieder

Message:

 

Location:

code/branches/main_reto

Files:

• . (modified) (1 prop)
• include/WeaponManager.h (added)
• src/OrxonoxShip.cpp (modified) (2 diffs)
• src/WeaponManager.cpp (added)
• weapon_framework/weapon_framework.suo (modified) (previous)
• weapon_framework/weapon_framework.vcproj (modified) (8 diffs)
• weapon_framework/weapon_framework.vcproj.RGRIEDERT60.rgrieder.user (modified) (3 diffs)

code/branches/main_reto/src/OrxonoxShip.cpp

@@ -3 +3 @@
 
 OrxonoxShip::OrxonoxShip(SceneManager *mSceneMgr, SceneNode *mNode)
-        : mSceneMgr(mSceneMgr), mRootNode(mNode), speed(Vector3(0, 0, 0)), baseThrust(100), thrust(0), sideThrust(0), n(0),
+        : mSceneMgr(mSceneMgr), mRootNode(mNode), speed(Vector3(0, 0, 0)), baseThrust(1000), thrust(0), sideThrust(0), n(0),
         bulletSpeed(400)
 {
@@ -77 +77 @@
 {
         speed += (mRootNode->getLocalAxes() * Vector3(0, 0, -1)).normalisedCopy() * thrust * deltaTime;
-        speed += (mRootNode->getLocalAxes() * Vector3(1, 0,  0)).normalisedCopy() * sideThrust * deltaTime;
+        speed += (mRootNode->getLocalAxes() * Vector3(-1, 0,  0)).normalisedCopy() * sideThrust * deltaTime;
 
         mRootNode->translate(speed * deltaTime);

code/branches/main_reto/weapon_framework/weapon_framework.vcproj

@@ -18 +18 @@
                 <Configuration
                         Name="Debug|Win32"
-                        OutputDirectory="$(OGRE_HOME)\Samples\Common\bin$(ConfigurationName)"
-                        IntermediateDirectory="$(ConfigurationName)"
+                        OutputDirectory="..\bin\$(ConfigurationName)"
+                        IntermediateDirectory="..\obj\$(ConfigurationName)"
                         ConfigurationType="1"
                         CharacterSet="1"
@@ -41 +41 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories="..\include;$(OGRE_HOME)\OgreMain\include;$(OGRE_HOME)\Samples\Common\include;$(OGRE_HOME)\Dependencies\include"
+                                AdditionalIncludeDirectories="..\include;&quot;$(OGRE_HOME)\OgreMain\include&quot;;&quot;$(OGRE_HOME)\Dependencies\include&quot;"
                                 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
                                 MinimalRebuild="true"
@@ -63 +63 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="OgreMain_d.lib OIS_d.lib"
-                                OutputFile="..\bin\$(ConfigurationName)$(ProjectName).exe"
+                                OutputFile="$(OutDir)\$(ProjectName).exe"
                                 LinkIncremental="2"
                                 AdditionalLibraryDirectories="$(OGRE_HOME)\lib;$(OGRE_HOME)\Dependencies\lib\$(ConfigurationName)"
@@ -97 +97 @@
                 <Configuration
                         Name="Release|Win32"
-                        OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-                        IntermediateDirectory="$(ConfigurationName)"
+                        OutputDirectory="..\bin\$(ConfigurationName)"
+                        IntermediateDirectory="..\obj\$(ConfigurationName)"
                         ConfigurationType="1"
                         CharacterSet="1"
@@ -120 +120 @@
                         <Tool
                                 Name="VCCLCompilerTool"
-                                AdditionalIncludeDirectories="..\include;$(OGRE_HOME)\OgreMain\include;$(OGRE_HOME)\Samples\Common\include;$(OGRE_HOME)\Dependencies\include"
+                                AdditionalIncludeDirectories="..\include;&quot;$(OGRE_HOME)\OgreMain\include&quot;;&quot;$(OGRE_HOME)\Dependencies\include&quot;"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
                                 RuntimeLibrary="2"
@@ -140 +140 @@
                                 Name="VCLinkerTool"
                                 AdditionalDependencies="OgreMain.lib OIS.lib"
-                                OutputFile="..\bin\$(ConfigurationName)$(ProjectName).exe"
+                                OutputFile="$(OutDir)\$(ProjectName).exe"
                                 LinkIncremental="1"
                                 AdditionalLibraryDirectories="$(OGRE_HOME)\lib;$(OGRE_HOME)\Dependencies\lib\$(ConfigurationName)"
@@ -215 +215 @@
                                 >
                         </File>
+                        <File
+                                RelativePath="..\src\WeaponManager.cpp"
+                                >
+                        </File>
                 </Filter>
                 <Filter
@@ -249 +253 @@
                                 >
                         </File>
+                        <File
+                                RelativePath="..\include\WeaponManager.h"
+                                >
+                        </File>
                 </Filter>
                 <Filter

code/branches/main_reto/weapon_framework/weapon_framework.vcproj.RGRIEDERT60.rgrieder.user

@@ -11 +11 @@
                         <DebugSettings
                                 Command="$(TargetPath)"
-                                WorkingDirectory="$(OGRE_HOME)\Samples\Common\bin\debug"
+                                WorkingDirectory="..\bin\$(ConfigurationName)"
                                 CommandArguments=""
                                 Attach="false"
@@ -39 +39 @@
                         <DebugSettings
                                 Command="$(TargetPath)"
-                                WorkingDirectory=""
+                                WorkingDirectory="..\bin\$(ConfigurationName)"
                                 CommandArguments=""
                                 Attach="false"
@@ -51 +51 @@
                                 Environment=""
                                 EnvironmentMerge="true"
-                                DebuggerFlavor=""
+                                DebuggerFlavor="0"
                                 MPIRunCommand=""
                                 MPIRunArguments=""