Changeset 11739 for code/branches/Presentation_HS17_merge/src/modules/asteroidmining/SpicedAsteroidBelt.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/SpicedAsteroidBelt.h (modified) (2 diffs)

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

@@ -72 +72 @@
             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 setSegments(int s){this->segments = s;}
             inline int getSegments(){return this->segments;}
 
-            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 setRadius0(float r0){this->radius0 = r0;}
-            inline int getRadius0(){return this->radius0;}
+            inline float getRadius0(){return this->radius0;}
 
             inline void setRadius1(float r1){this->radius1 = r1;}
-            inline int getRadius1(){return this->radius1;}            
+            inline float getRadius1(){return this->radius1;}
 
             inline void setFog(bool f){this->foggy = f;}
@@ -111 +111 @@
             int segments; //!< Number of asteroidFields that get generated. 
             
-            int maxSize; //!< Most obese asteroid possible
-            int minSize; //!< Most meagre asteroid possible
+            float maxSize; //!< Most obese asteroid possible
+            float minSize; //!< Most meagre asteroid possible
 
             float radius0; //!< Inner radius