Changeset 2667 for code/branches

Timestamp:

Feb 15, 2009, 12:48:03 AM (16 years ago)

Author:

rgrieder

Message:

Windows version compiling and running so far (msvc and mingw).

Location:

code/branches/buildsystem3/src

Files:

• core/Factory.h (modified) (1 diff)
• core/Identifier.h (modified) (1 diff)
• core/RootGameState.cc (modified) (2 diffs)
• network/CMakeLists.txt (modified) (1 diff)
• network/NetworkPrereqs.h (modified) (1 diff)
• network/TrafficControl.h (modified) (1 diff)
• network/synchronisable/CMakeLists.txt (modified) (2 diffs)
• network/synchronisable/SynchronisableVariable.h (modified) (1 diff)
• orxonox/objects/worldentities/Planet.cc (modified) (3 diffs)
• orxonox/objects/worldentities/Planet.h (modified) (3 diffs)

code/branches/buildsystem3/src/core/Factory.h

@@ -49 +49 @@
 #include <map>
 #include <string>
-#include "util/Integers.h"
 
 namespace orxonox

code/branches/buildsystem3/src/core/Identifier.h

@@ -68 +68 @@
 #include "Super.h"
 #include "Functor.h"
-#include "util/Integers.h"
 #include "util/Debug.h"
 #include "util/String.h"

code/branches/buildsystem3/src/core/RootGameState.cc

@@ -135 +135 @@
     {
         // Don't catch errors when having a debugger in msvc
-#if ORXONOX_COMPILER != ORXONOX_COMPILER_MSVC || defined(NDEBUG)
+#if !defined(ORXONOX_COMPILER_MSVC) || defined(NDEBUG)
         try
         {
@@ -158 +158 @@
 
             this->deactivate();
-#if ORXONOX_COMPILER != ORXONOX_COMPILER_MSVC || defined(NDEBUG)
+#if !defined(ORXONOX_COMPILER_MSVC) || defined(NDEBUG)
         }
         // Note: These are all unhandled exceptions that should not have made its way here!

code/branches/buildsystem3/src/network/CMakeLists.txt

@@ -34 +34 @@
 )
 ADD_SUBDIRECTORY(packet)
+ADD_SUBDIRECTORY(synchronisable)
 GET_ALL_HEADER_FILES(NETWORK_HDR_FILES)
 SET(NETWORK_FILES ${NETWORK_SRC_FILES} ${NETWORK_HDR_FILES})
 
 GENERATE_SOURCE_GROUPS(${NETWORK_FILES})
-ADD_SOURCE_DIRECTORY(NETWORK_SRC_FILES synchronisable)
 
 ADD_LIBRARY(network SHARED ${NETWORK_FILES})

code/branches/buildsystem3/src/network/NetworkPrereqs.h

@@ -57 +57 @@
 
 //-----------------------------------------------------------------------
-// Includes
-//-----------------------------------------------------------------------
-#include "util/Integers.h"
-
-//-----------------------------------------------------------------------
 // Library global contants
 //-----------------------------------------------------------------------

code/branches/buildsystem3/src/network/TrafficControl.h

@@ -36 +36 @@
 #include <utility>
 #include <algorithm>
-#include "util/Integers.h"
 #include "core/OrxonoxClass.h"
 #include "network/ClientConnectionListener.h"

code/branches/buildsystem3/src/network/synchronisable/CMakeLists.txt

@@ -1 @@
-SET( SRC_FILES
+ADD_SOURCE_FILES(NETWORK_SRC_FILES
   NetworkCallbackManager.cc
   Synchronisable.cc
@@ -5 +5 @@
   SynchronisableVariable.cc
 )
-
-ADD_SOURCE_FILES(SRC_FILES)

code/branches/buildsystem3/src/network/synchronisable/SynchronisableVariable.h

@@ -35 +35 @@
 #include <string>
 #include <cassert>
-#include "util/Integers.h"
 #include "core/Core.h"
 #include "core/CoreIncludes.h"

code/branches/buildsystem3/src/orxonox/objects/worldentities/Planet.cc

@@ -74 +74 @@
         if(activeCamera)
         {
-            Real distance = this->getPosition().distance( activeCamera->getWorldPosition() );
+            float distance = this->getPosition().distance( activeCamera->getWorldPosition() );
             //             COUT(2) << distance << std::endl;
-            Real planetRadius = this->getScale();
+            float planetRadius = this->getScale();
 
-            Real newScale = 2 * distance / sqrt(distance*distance - planetRadius*planetRadius);
-            Real tempTest = newScale*(1+Real(this->atmosphereSize)/Real(this->imageSize));
+            float newScale = 2 * distance / sqrt(distance*distance - planetRadius*planetRadius);
+            float tempTest = newScale*(1+float(this->atmosphereSize)/float(this->imageSize));
             newScale = tempTest;
 
@@ -90 +90 @@
     void Planet::init()
     {
-        Real scaleFactor = this->getScale();
+        float scaleFactor = this->getScale();
 
         this->distList.push_back(10.0*scaleFactor);
@@ -103 +103 @@
         this->distList.push_back(55.0*scaleFactor);
 
-        Real reductionValue = 0.2;
+        float reductionValue = 0.2;
 
         this->mesh_.getEntity()->getMesh()->generateLodLevels(distList, Ogre::ProgressiveMesh::VRQ_PROPORTIONAL, reductionValue);

code/branches/buildsystem3/src/orxonox/objects/worldentities/Planet.h

@@ -71 +71 @@
             }
             
-            inline void setAtmosphereSize(Real size){
+            inline void setAtmosphereSize(float size){
                 this->atmosphereSize = size;
             }
             
-            inline Real getAtmosphereSize(){
+            inline float getAtmosphereSize(){
                 return this->atmosphereSize;
             }
@@ -87 +87 @@
             }
             
-            inline void setImageSize(Real size){
+            inline void setImageSize(float size){
                 this->imageSize = size;
             }
             
-            inline Real getImageSize(){
+            inline float getImageSize(){
                 return this->imageSize;
             }
@@ -106 +106 @@
             std::string atmosphere_;
             Mesh mesh_;
-            Real atmosphereSize;
-            Real imageSize;
+            float atmosphereSize;
+            float imageSize;
             Ogre::Mesh::LodDistanceList distList;
             BillboardSet billboard_;