Calculate randomTranslate on ResourceParameter

giogix2 · Feb 10, 2017 · 1600940 · 1600940
1 parent abf7e08
commit 1600940
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/HeightMap.cpp b/HeightMap.cpp
@@ -65,12 +65,7 @@ HeightMap::HeightMap(unsigned int size,
     minHeight = -maxAmplitude;
     maxHeight = +maxAmplitude;
 
-    /* Re-create randomTranslate using seed. Avoids passing it as a costructor
-     * parameter. */
-    srand(RParam->getSeed());
-    randomTranslate.x = (float)((rand() % 1000)-500)/100.0f;
-    randomTranslate.y = (float)((rand() % 1000)-500)/100.0f;
-    randomTranslate.z = (float)((rand() % 1000)-500)/100.0f;
+    RParam->getRandomTranslate(randomTranslate.x, randomTranslate.y, randomTranslate.z);
 }
 
 HeightMap::~HeightMap()

diff --git a/PSphere.cpp b/PSphere.cpp
@@ -106,10 +106,7 @@ void PSphere::create(Ogre::uint32 iters, Ogre::uint32 gridSize, ResourceParamete
     rotX_90 = Ogre::Matrix3(1.0f, 0.0f, 0.0f, 0.0f, 0.0f, -1.0f, 0.0f, 1.0f, 0.0f);
     rotX_270 = Ogre::Matrix3(1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, -1.0f, 0.0f);
 
-    srand(RParameter.getSeed());
-    randomTranslate.x = (float)((rand() % 1000)-500)/100.0f;
-    randomTranslate.y = (float)((rand() % 1000)-500)/100.0f;
-    randomTranslate.z = (float)((rand() % 1000)-500)/100.0f;
+    RParameter.getRandomTranslate(randomTranslate.x, randomTranslate.y, randomTranslate.z);
 
     calculateSeaLevel(minimumHeight, maximumHeight, waterFraction);
 

diff --git a/ResourceParameter.cpp b/ResourceParameter.cpp
@@ -24,6 +24,7 @@
 #include <algorithm>
 #include <vector>
 #include <sstream>
+#include <stdlib.h>
 
 using namespace std;
 
@@ -151,6 +152,13 @@ unsigned int ResourceParameter::getSeed(void)
 {
     return seed;
 }
+void ResourceParameter::getRandomTranslate(float &x, float &y, float &z)
+{
+    srand(this->seed);
+    x = (float)((rand() % 1000)-500)/100.0f;
+    y = (float)((rand() % 1000)-500)/100.0f;
+    z = (float)((rand() % 1000)-500)/100.0f;
+}
 vector <float>& ResourceParameter::getFrequency(void)
 {
     return frequency;

diff --git a/ResourceParameter.h b/ResourceParameter.h
@@ -66,6 +66,7 @@ class ResourceParameter
     float getWaterFraction(void);
     float getRadius(void);
     unsigned int getSeed(void);
+    void getRandomTranslate(float &x, float &y, float &z);
     std::vector <float>& getFrequency(void);
     std::vector <float>& getAmplitude(void);
     std::vector<std::pair <float, float> >& getFrequencyAmplitude(void);