From f71658e38dbcfc5635a6b2a9c6c4168582728bb5 Mon Sep 17 00:00:00 2001
From: krzys-h <krzys_h@interia.pl>
Date: Thu, 10 Apr 2014 21:50:26 +0200
Subject: Random relief generator

---
 src/graphics/engine/terrain.cpp | 60 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

(limited to 'src/graphics/engine/terrain.cpp')

diff --git a/src/graphics/engine/terrain.cpp b/src/graphics/engine/terrain.cpp
index 4b5384e..e6ca824 100644
--- a/src/graphics/engine/terrain.cpp
+++ b/src/graphics/engine/terrain.cpp
@@ -331,6 +331,66 @@ bool CTerrain::LoadRelief(const std::string &fileName, float scaleRelief,
     return true;
 }
 
+bool CTerrain::RandomizeRelief()
+{
+    // Perlin noise
+    // Based on Python implementation by Marek Rogalski (mafik)
+    // http://amt2014.pl/archiwum/perlin.py
+    
+    int size = (m_mosaicCount*m_brickCount)+1;
+    const int ilosc_oktaw = 6;
+    
+    float* oktawy[ilosc_oktaw];
+    for(int i=0; i<ilosc_oktaw; i++)
+    {
+        int pxCount = static_cast<int>(pow(2, (i+1)*2));
+        oktawy[i] = new float[pxCount];
+        for(int j=0; j<pxCount; j++)
+        {
+            oktawy[i][j] = Math::Rand();
+        }
+    }
+    
+    for(int y2=0; y2 < size; y2++)
+    {
+        float y = static_cast<float>(y2) / size;
+        for(int x2=0; x2 < size; x2++)
+        {
+            float x = static_cast<float>(x2) / size;
+            
+            float wart = 0;
+            for(int i=0; i<ilosc_oktaw; i++)
+            {
+                int rozmiar_oktawy = sqrt(static_cast<int>(pow(2, (i+1)*2)));
+                double xi, yi, a, b;
+                a = modf(x * (rozmiar_oktawy-1), &xi);
+                b = modf(y * (rozmiar_oktawy-1), &yi);
+                /*int xi = floor(x * (rozmiar_oktawy-1));
+                int yi = floor(y * (rozmiar_oktawy-1));
+                float a = (x * (rozmiar_oktawy-1)) - xi;
+                float b = (y * (rozmiar_oktawy-1)) - yi;*/
+                //CLogger::GetInstancePointer()->Error("%f %f %f %f\n", xi, yi, a, b);
+                
+                float lg = oktawy[i][static_cast<int>(yi * rozmiar_oktawy + xi)];
+                float pg = oktawy[i][static_cast<int>(yi * rozmiar_oktawy + xi + 1)];
+                float ld = oktawy[i][static_cast<int>((yi+1) * rozmiar_oktawy + xi)];
+                float pd = oktawy[i][static_cast<int>((yi+1) * rozmiar_oktawy + xi + 1)];
+                //CLogger::GetInstancePointer()->Error("%f %f %f %f\n", lg, pg, ld, pd);
+                
+                float g = pg * a + lg * (1-a);
+                float d = pd * a + ld * (1-a);
+                float res = d * b + g * (1-b);
+                wart += res;
+            }
+            
+            wart /= ilosc_oktaw;
+
+            m_relief[x2+y2*size] = wart * 255.0f;
+        }
+    }
+    return true;
+}
+
 bool CTerrain::AddReliefPoint(Math::Vector pos, float scaleRelief)
 {
     float dim = (m_mosaicCount*m_brickCount*m_brickSize)/2.0f;
-- 
cgit v1.2.3-1-g7c22


From f0d97bfdb91a2c0a17d1697b145d4df930280dbb Mon Sep 17 00:00:00 2001
From: krzys-h <krzys_h@interia.pl>
Date: Sun, 18 May 2014 12:12:47 +0200
Subject: Better datadir mod support

---
 src/graphics/engine/terrain.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/graphics/engine/terrain.cpp')

diff --git a/src/graphics/engine/terrain.cpp b/src/graphics/engine/terrain.cpp
index e6ca824..5f37cd8 100644
--- a/src/graphics/engine/terrain.cpp
+++ b/src/graphics/engine/terrain.cpp
@@ -19,6 +19,7 @@
 #include "graphics/engine/terrain.h"
 
 #include "app/app.h"
+#include "app/gamedata.h"
 
 #include "common/image.h"
 #include "common/logger.h"
@@ -189,7 +190,7 @@ void CTerrain::AddMaterial(int id, const std::string& texName, const Math::Point
 bool CTerrain::LoadResources(const std::string& fileName)
 {
     CImage img;
-    std::string path = CApplication::GetInstance().GetDataFilePath(DIR_TEXTURE, fileName);
+    std::string path = CGameData::GetInstancePointer()->GetFilePath(DIR_TEXTURE, fileName);
     if (! img.Load(path))
     {
         GetLogger()->Error("Cannot load resource file: '%s'\n", path.c_str());
@@ -286,7 +287,7 @@ bool CTerrain::LoadRelief(const std::string &fileName, float scaleRelief,
     m_scaleRelief = scaleRelief;
 
     CImage img;
-    std::string path = CApplication::GetInstance().GetDataFilePath(DIR_TEXTURE, fileName);
+    std::string path = CGameData::GetInstancePointer()->GetFilePath(DIR_TEXTURE, fileName);
     if (! img.Load(path))
     {
         GetLogger()->Error("Could not load relief file: '%s'!\n", path.c_str());
-- 
cgit v1.2.3-1-g7c22