Changeset 11739 for code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidField.h

Timestamp:

Feb 12, 2018, 12:17:34 AM (7 years ago)

Author:

landauf

Message:

[AsteroidMining_HS17] fixed a bunch of compiler warnings

File:

• code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidField.h (modified) (2 diffs)

code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidField.h

@@ -60 +60 @@
             virtual void tick(float dt) override;
 
-            inline void setCount(float s){this->count = s;}
-            inline float getCount(){return this->count;}
+            inline void setCount(int s){this->count = s;}
+            inline int getCount(){return this->count;}
 
             inline void setMineralDensity(float d){this->mDensity = d;}
             inline float getMineralDensity(){return this->mDensity;}
 
-            inline void setPosition(Vector3 v){this->position = v;}
-            inline Vector3 getPosition(){return this->position;}
+            inline void setPosition(const Vector3& v){this->position = v;}
+            inline const Vector3& getPosition(){return this->position;}
 
-            inline void setMaxSize(int i){this->maxSize = i;}
-            inline int getMaxSize(){return this->maxSize;}
+            inline void setMaxSize(float i){this->maxSize = i;}
+            inline float getMaxSize(){return this->maxSize;}
 
-            inline void setMinSize(int i){this->minSize = i;}
-            inline int getMinSize(){return this->minSize;}
+            inline void setMinSize(float i){this->minSize = i;}
+            inline float getMinSize(){return this->minSize;}
 
             inline void setRadius(float r){this->radius = r;}
-            inline int getRadius(){return this->radius;}
+            inline float getRadius(){return this->radius;}
 
             inline void setFog(bool f){this->foggy = f;}
@@ -86 +86 @@
         protected:
 
-            float count; //!< Number of asteroids generated
+            int count; //!< Number of asteroids generated
             float mDensity; //!< Mineral density, between 0 and 1;
 
             Vector3 position; //!< The center
             
-            int maxSize; //!< Upper bound to asteroid size 
-            int minSize; //!< Lower bound to asteroid size
+            float maxSize; //!< Upper bound to asteroid size
+            float minSize; //!< Lower bound to asteroid size
 
             float radius; //!< Asteroids can appear within a sphere. 
             bool foggy; //!< Whether there's fog
-            float fogDensity; 
+            float fogDensity;